Merge "Update boot image and system server profiles [M5C5P89S0PP]" into sc-dev am: 6addf585 am: c6b74356 am: 0e3d092a

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

Change-Id: If6e16511e3116c8f59ce7d69209a91ca89a71db4