Merge "Update boot image and system server profiles [M80C35P56S0PP]" into main am: 111967e5c1

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

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