Merge "Ensure the Bubble settings intent is started as the correct user" into...
Merge "Ensure the Bubble settings intent is started as the correct user" into qt-dev am: 9543be75 am: e51a7a19
am: f22f0855
Change-Id: Ib9a8dc205c74bc08d3571c79997902a10624f2a4