[conflict] Merge "Fix logspam due to missing /vendor/etc/public.libraries.txt" into main am: 997af74d7f am: b8cdb954e7 am: ea8bfaa36e

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

Bug: 290842519
Change-Id: I6eb86ad081bfd634fe5d13876dae6db8b10d7d2c
Merged-In: I8c21ccb5603fe1f3d523ce762ccc2f7191d74938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>

services/core/java/com/android/server/SystemConfig.java

@@ -1827,6 +1827,9 @@ public class SystemConfig {
                         soname, soname, new String[0], true);
                 mSharedLibraries.put(entry.name, entry);
             }
+        } catch (FileNotFoundException e) {
+            // Expected for /vendor/etc/public.libraries.txt on some devices
+            Slog.d(TAG, listFile + " does not exist");
         } catch (IOException e) {
             Slog.w(TAG, "Failed to read public libraries file " + listFile, e);
         }