[automerger skipped] Merge "[CS15]Do not use hidden API of PlatformProperties" am: b9db86ff3b am: 44d34df483 am: 7e3ba1577f -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2de4002e694a8063b60b0f6b043bb8830e7a373
tree: 9c106ba69c641c44128c1dd274de754f38ecebe2
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS