Merge "Fix the path of boot image profile and preloaded classes for frameworks." am: 0e52d9c6f9 am: 43927fdefc

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

Change-Id: I6e547ce0830ef25f846e6556c91d1ec0a5766f0d