Merge "Merge "Cleans up sharedUser regardless of creation logic" into qt-dev am: a1bf282e43 am: da658b4a34 am: 0796e013f2" into qt-qpr1-dev-plus-aosp