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: Ibd3442cdeb802ff73ab103e5e43b659714813380
This commit is contained in: