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

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



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