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 am: 7e00c6fb am: 88862dd5

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



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