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

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

Change-Id: I730897a68036ed96d058fc488774e6f19846fa91