tree 1493c4ce05da0969aa4bacabffa2a513c0602070
parent bb61729561ea104083f043ca974056a1ede6f71c
parent cb0e05bfad12c313b3f4c94edd971546291b96cd
author Bill Yi <byi@google.com> 1600118330 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600118330 +0000

[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