[automerger skipped] Avoid flakiness from DeviceConfig. am: c2c83bc1 am:...

[automerger skipped] Avoid flakiness from DeviceConfig. am: c2c83bc1 am: 1fd93def -s ours am: c35425c1 -s ours am: 1508d7c2 -s ours am: 99493cd2 -s ours

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

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



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