Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36
am: 52ea712e3b
am: c714533fd2
am: 123cb13df8
am: ed9a891fa1
am: 355dcf3757
am: d7364ca738
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883 Change-Id: I32ab894824845e05bfa49ffeac5e6fcbdc382b1b
This commit is contained in: