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

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

Change-Id: I6f3dfe1ae28cedc257b25c95ea78759bd85d9831