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

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

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