[automerger skipped] Merge "[Ravenwood] Support DeviceConfig" into main am: 3b26c2b48e am: f8a6604e16 -s ours

am skip reason: Merged-In I920c65840776669acee4783e0f2ca23aecc0ea1b with SHA-1 3b26fcade3 is already in history

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

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