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 am: 12d1b6f8

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



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