Merge "[automerger skipped] Avoid flakiness from DeviceConfig. am: c2c83bc1 am: cfdf194b am: 6535b8e2 -s ours am: 0bdf223f -s ours am: 977de203 -s ours am: 0076e441 -s ours" into udc-qpr-dev-plus-aosp am: 33ec357b -s ours

am skip reason: Merged-In I3a7f23b6e9c4277c9d521e7a33b29a0bbfd02331 with SHA-1 c2c83bc1 is already in history

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



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