[automerger skipped] Merge Android U (ab/10368041) am: 79020a5881 -s ours am: 4f59925ecb -s ours am: 77be2433f5 -s ours

am skip reason: Merged-In I97a256577621704e0dc522bed6b3626b54ca3214 with SHA-1 ff9dede8a6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libsysprop/+/24182430

Change-Id: Ic36b1fea30b023b5679c24beff00fd153ac14f1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: f5c8b46cd08f4eb4a3c2404520aeacb15d38b245
  1. srcs/
  2. CAR_OWNERS
  3. OWNERS