Merge "Revert "Update boot image and system server profiles [M84C39P60S0PP]"" into main am: 4149dd6e4a

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

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