Merge "Swap target_required by device_common_data" into main am: bc3378bf am: 54287ca6

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



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