Snap for 6948038 from 12b70fab4d8504edc7f66d067b7d2f01ae01b4af to rvc-platform-release am: ba2684e386

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/tools/mkbootimg/+/12979295

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e34595f8c1ceeebb74c961c90d2e8cb00cc6ce6