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

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

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