Merge changes from topic "update_sysprop_api_txt" am: da2ce9eae8 am: 08a11ec1b5 am: 732c8b8f4a

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

Change-Id: Ia59d666a9a46be97b39445fcf47da2143d12fedc