Merge "Revert "Update boot image and system server profiles [M60C35P85S0PP]""...

Merge "Revert "Update boot image and system server profiles [M60C35P85S0PP]"" into udc-dev am: e16f2355 am: 1dd9d0dd

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



Change-Id: I70c447ae68c74c531095e50c074f2b0dd2e7c1d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>