Merge "Remove DeviceConfig dependency." into tm-qpr-dev am: a8fd186b am: 05dd1d9e

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



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