Merge "Update boot image and system server profiles [M10C10P80S0]" into tm-dev...

Merge "Update boot image and system server profiles [M10C10P80S0]" into tm-dev am: 0cbdd275 am: fdadb861

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



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