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

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



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