Snap for 8492635 from aac800dc0096c5016bb379c52084fa5afb107d2c to tm-release am: 7d8ef95838 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libsysprop/+/17923425 Change-Id: If70248e848b91f0fe0dd63e255f6fd1bdccf6469 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>