Merge "Revoke internal permissions upon owner change." into sc-dev am: b8dec4bf am: e039d857 am: 13e7ba5b am: 8211dfcb

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

Change-Id: I77ccb255e7c749ce4c606bdee08f9e5fa3595015