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

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

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