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

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

Change-Id: Ie8b47b8cb28d6a7724106d9af343df2f46744320