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: I84655cffd57a9e23a34a4650395508eb7d80eec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>