[automerger skipped] Merge Android U (ab/10368041) am: 79020a5881 -s ours am: 4f59925ecb -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: Ibb2012ce0279d015db1d2a14dcff700b64b6aa88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: b4aa1c5acd06dfdd2fd0c4ebd2f772aa38a28cf6
  1. srcs/
  2. CAR_OWNERS
  3. OWNERS