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

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

Change-Id: I9c731a33701ea9a0787c1e523d6c6a51714f6950