[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: e426ba915b am: f260cf7728 -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: I0d96c5be7188d6762d6f3f72545d7293fcaf7680