Merge changes from topic "cf_system_root_files" into main am: 0c71fa98

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3166519



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