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

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

Change-Id: Idef1834508a0ad009325f504e264c2f7210551a2