Merge "Add app's own UID to the default ACL. am: 1129b81071 am: 53b6f32850" into rvc-d1-dev-plus-aosp