[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
am: d6ed1528cb
-s ours am: 8797825bc1
-s ours am: 31c29a0791
-s ours am: 8ae86914d6
-s ours
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: I5c4bcf5792f7e9a5564444bb5d5c98f473e1b619
This commit is contained in: