Merge "Refactor PlatformCompat and related files." am: 5d37ff2d33 am: 3cfd32b11f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia183bbd2338415608ad962e80336e05bc6d99612