[automerger skipped] Merge "[CS15]Do not use hidden API of PlatformProperties" am: ed60cc949b am: ee705dfe0c am: 2e196d3e6a -s ours

am skip reason: Change-Id I3a3deca5d2e0f690db8c0061de2db2217376d268 with SHA-1 702f6552fd is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2de4002e694a8063b60b0f6b043bb8830e7a373