DO NOT MERGE Add permission checks before delivery am: ca643c5c33

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

Change-Id: Id1723478e8616b60be28d12ccaa4705d6a87395b