[automerger skipped] Merge "Configure Bluetooth profiles displayed in settings" into rvc-qpr-dev am: f8501da319 -s ours am: dfb10a81c4 -s ours
am skip reason: Change-Id I62b8778517730076554ba996cee80862ce72539b with SHA-1 f87daf40c2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13474716
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib986fb79f01bd19c3fa583c01efa6e17af5aa0d4
This commit is contained in: