Merge "Revoke internal permissions upon owner change." into sc-dev am:...

Merge "Revoke internal permissions upon owner change." into sc-dev am: b8dec4bf am: e039d857 am: 0f82d26c am: 3f9baded

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15615897

Change-Id: I9be0c0d97d003015af05f45df2cff921a948d1b0