Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: a1efc0c63c

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

Change-Id: Ic7124f1f1c98847d602104b8ef0ed60fb40d6423