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

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

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



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