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

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

Change-Id: Id69fd14fdd4fbda403978ac7502966fa96f309d0