Avoid flakiness from DeviceConfig. am: c2c83bc159

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

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