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

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

Change-Id: Iec20f9559c150ee1edb0cdd3636e049f1c7bb94b