Merge "Add back WRITE_DEVICE_CONFIG permission to test." into udc-dev am: 18b2d81ec8 am: f6763c9fe2 am: 356e7a04ed am: f0435b6688
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23266011 Change-Id: I3758fb878f2fc421aa6d40aeefef38220e223b68 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: