Merge changes from topic "fastboot_fetch" am: 4bf547af43

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

Change-Id: I5d018eb2c5fa2536275e3c36d36e5b5a7f65ac2f