Merge "Merge "Fix shared uid permission test to match actual behavior." into qt-r1-dev am: aed8bc8027 am: 01ea8aa7b8" into qt-qpr1-dev-plus-aosp