Merge "Fix permission issue when provisioning." into udc-dev am: bf78a8d1 am: 54b7acbb

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



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