Merge "Support passing multiple res folders" into tm-qpr-dev am: 9f2c906504 am: 231ea90f79

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/systemlibs/+/20480634

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