Merge "Fix the bluetooth extra control slice not visible" into tm-qpr-dev am: 3cb39ca221

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

Change-Id: I78447f80bd4971eeb67395107a3731ccbcc18f63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>