Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36
am: 52ea712e3b
am: c714533fd2
am: 72cda9d96c
am: bb78247cf0
am: b96d8078b7
am: c7621e5c88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883 Change-Id: Ieb19e83a1a3a9814860d985b3dccbb2c123e7667
This commit is contained in: