Merge "Disable JIT in BootImageProfileTest." am: 89320ec08f am: 3e8f4a285c

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

Change-Id: I495428c47a8ae41588380a4395d994772a761c44