[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: d3023bd990 -s ours am: 1d563d136e -s ours

am skip reason: Merged-In Ia5d47d496a098caa58222820c3ac4c757bd55a91 with SHA-1 31bbc755dd is already in history

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

Change-Id: Ib752c9c9d44eaeab749cfcf2b3b3865971b2c5e9
tree: 455f8bca670e82be8b576f961d50856e1619c6bc
  1. srcs/
  2. OWNERS