tree bdd0a27fc2831a0305273a878fb0fd8551576241
parent 7e3123b5242cc260cfc86400c15f9ad1cf095529
parent 4289fb0a7160481ba913e02b20b39a34ce89ba88
author Bill Yi <byi@google.com> 1612462756 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612462756 +0000

[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 4289fb0a71 -s ours

am skip reason: Change-Id Ib07b6c0101dd9e081454a420c2853d9fa47d97aa with SHA-1 55bafa70c3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id45084b4438be2d24d81697c876f3f16e8847eb4