[automerger skipped] Merge "[CS15]Do not use hidden API of PlatformProperties" am: ed60cc94 am: ee705dfe am: 2e196d3e -s ours am: 277c51d6 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8206c3fa84560c0aed1a88dc91bc4bf5097e7298