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: f27394ae
am: fe43b7e4
Change-Id: I680897252d522c9eb3d247fba2975e5509a1f487