[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: e426ba915b am: f260cf7728 -s ours am: d6f33d65b0 -s ours am: 1eb4303f5d -s ours

am skip reason: Change-Id I53be84dd3523bbcfff8272718149e3b372af3da5 with SHA-1 557fb5aba0 is in history

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

Change-Id: Ib3a6da2aff86b44c5fa5f739c8508253ccebb32e