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

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

Change-Id: Ie3b2fbf2851440f67ef005c62fdebaa8886aa8e4