Merge "FastbootDevice::boot1_1 null pointer dereference" into main am: 608e33f736 am: 828d85ae89 am: 932fe519f6

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2768099

Change-Id: Ic2cecbd2bb771b682bb6f97e596a0759f804a774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>