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

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

Change-Id: I128d5635d93009fa62c2efe30a12d6b6a996a0d7