Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into...

Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dc am: 537c730c am: 4c4f83eb am: db48b810 am: f7f17811 am: 3a150908

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79072429c6566eeaf99b41d6e68d6d5acca30e84