Merge "Revert "Disable BootImageProfileTest"" am: 5f2ee40ea3 am: 1815e73a11

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

Change-Id: Ic33f63b622c862880c436caa66927c2c361d9b65