Merge "Guard setting of remote entry with a permission" into udc-dev am: 59830725 am: 5f0d0d5c

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



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