[automerger skipped] Prevent overlay drawing on top of Bluetooth activity...

[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c0365 am: c721dc5b -s ours am: b15b6450 -s ours am: d35af468 -s ours am: 24c8adbd -s ours am: 45408390 -s ours

am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf69 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e9e2e450889fcbbb2d6255d4846632fef8d6dcb