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

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

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



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