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

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

Change-Id: I990cd6e7409ff1a02603619b13d3751a70d6e1c3