AOSP/Messaging - Changes to make unit tests to run and pass. am: b1aa213ce9 am: 4c12eb471c

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

Change-Id: Ie84f1ff41433b8d07cf1306723e772dd598b3ccf