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

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

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