Merge "Move permission enforcement to onCommand" into sc-dev am: fe219c9698 am: 09b9ec73c2 am: 6530c2e17f

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

Change-Id: I86e7199406c4cab9aa1a27cdae98a6dd72b3054b