Merge "Reconcile differences between boot image profiles." am: 181c8f0033 am: de2b0ded2e am: 0078967a5d am: 29816909b0

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

Change-Id: Ie293f972eac247a8c1e333ce6f2ee25d1ec97aec