Merge "[automerger skipped] Merge "Don't require bootloader fastboot for VTS compliance." into android10-tests-dev am: cd7a018917 -s ours" into android11-tests-dev am: 9a2f9eccc7

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

Change-Id: Ice9a4609982dbe439d2915265f6588bc6c399565