Merge "Don't wait on permission check." am: aa50ac1958 am: bc3792456d

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2216281

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