Merge "Revert "Update boot image and system server profiles [M24C20P47S0PP]""...

Merge "Revert "Update boot image and system server profiles [M24C20P47S0PP]"" into udc-dev am: dbc03a81

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



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