Merge "Merge "Add back `WRITE_DEVICE_CONFIG` permission to test." into udc-dev...

Merge "Merge "Add back `WRITE_DEVICE_CONFIG` permission to test." into udc-dev am: 18b2d81e am: f6763c9f" into udc-d1-dev-plus-aosp am: c0f2d622

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



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