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