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

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



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