Merge "Merge "Update boot image and system server profiles [M5C5P89S0PP]" into...

Merge "Merge "Update boot image and system server profiles [M5C5P89S0PP]" into sc-dev am: ada3f21c am: d877c8ae" into sc-v2-dev-plus-aosp am: 8108e487

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

Change-Id: I7df5a12dfb7861bf8410db07ac0b3f09769b0207