Merge "Enforce the permission and the owner rights earlier" into sc-dev am: ef02ab47 am: 536a22a3

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

Change-Id: I055f48aaf866f0a4fa7fcdf3f8eeb99e6019b7ef