Merge "Reconcile differences between boot image profiles." am: 181c8f0033 am: de2b0ded2e

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

Change-Id: Ib0f3bac0632876b514fab75fe0bc6f8a18b7effa