Merge "[CS15]Do not use hidden API of PlatformProperties" am: ed60cc949b am: ee705dfe0c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4bd903cd723f0c3d87ac9d2aae14a95132e7a2ea