Merge "Merge "Changes to MediaProjection UX." into qt-dev am: 7b25470fd9 am: 309228c28a" into qt-r1-dev-plus-aosp
am: 43eb6791cd

Change-Id: I2c1bf850002c4fe9b280cb0b14302b9a7d0a9d5f