[automerger skipped] Merge "[conflict] Merge "Fix logspam due to missing...

[automerger skipped] Merge "[conflict] Merge "Fix logspam due to missing /vendor/etc/public.libraries.txt" into main am: 997af74d am: b8cdb954 am: ea8bfaa3" into udc-dev-plus-aosp am: 98050f1b am: 62b5da53 am: 11cb68c6 -s ours

am skip reason: Merged-In I8c21ccb5603fe1f3d523ce762ccc2f7191d74938 with SHA-1 71c50c73 is already in history

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



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