[automerger skipped] Merge changes from topic "update_sysprop_api_txt" am:...

[automerger skipped] Merge changes from topic "update_sysprop_api_txt" am: da2ce9ea am: 08a11ec1 am: 732c8b8f am: 9a46d248 -s ours

am skip reason: Change-Id Ie6d6ff5ed6c3883cb3459b8fb57ca18f4ce28098 with SHA-1 032f11ee is in history

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

Change-Id: Ib873881e176e6d4c79a97267029c0e6258946787