[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: cb0e05bfad -s ours

am skip reason: Change-Id Ia872db62aa74ae480d48dcdcd53fb21c70918b62 with SHA-1 bb61729561 is in history

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

Change-Id: I53be84dd3523bbcfff8272718149e3b372af3da5