[automerger skipped] Merge "Revert "Update boot image and system server profiles [M84C39P60S0PP]"" into main am: 4149dd6e4a am: c7558ea2f2 -s ours

am skip reason: Merged-In I3485062a378bf2ce3b139a62c247dc33f4edd48e with SHA-1 a9d2cc7819 is already in history

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

Change-Id: Ib3d538f4570cc239421ddc2a4a6ef200edb6287c
Signed-off-by: Automerger Merge Worker <[email protected]>