[automerger skipped] Merge "Update boot image and system server profiles [M80C35P56S0PP]" into main am: 111967e5c1 am: 7915b27a05 -s ours

am skip reason: Merged-In Id6e9863dbeef2bc9ea4d8855e5d640dd81d16f8e with SHA-1 4816fa8ae8 is already in history

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

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