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

Merge "Revoke internal permissions upon owner change." into sc-dev am: b8dec4bf am: 814a74ae am: 550f797d am: 5eae04b8

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

Change-Id: I771bc87b87aa64bf6bb1ecae57435a03c2a276ea