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

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



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