Merge "Avoid creating a storage folder for fastboot devices command" am: 7988a0d0 am: 6707cdef

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



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