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

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



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