AOSP/Messaging - Changes to make unit tests to run and pass. am: b1aa213c am: 4c12eb47 am: 0875a142 am: 4671bcc5 am: 9312ecb2

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1360018

Change-Id: I29f928a256b1b26ab20f6833b98fc46e86e3462d