[automerger skipped] Avoid flakiness from DeviceConfig. am: c2c83bc159 am: 1fd93def57 -s ours
am skip reason: Merged-In I3a7f23b6e9c4277c9d521e7a33b29a0bbfd02331 with SHA-1 f270e394f3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22933028
Change-Id: Icd1f40a8648940dc0395eccec31c37f01b65d057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: