Merge "Add framework boot image" am: 08ff0a8639 am: 45f1fa008c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I167c76cc3f965e3feefde79f6af95241864d33d7