Merge "Merge "Merge "Cleans up sharedUser regardless of creation logic" into qt-dev am: a1bf282e am: da658b4a am: 0796e013" into qt-qpr1-dev-plus-aosp am: 3cad0a27"