Merge "Fix bug in permission checking" into udc-dev am: 16d277ab

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



Change-Id: Ic41b572a345d482162658f2dffbcc3b2a227b779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>