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

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

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