Snap for 8397960 from cade007f982c6ab6b0993feb66232d57a924035b to tm-release am: 6cb944b82c

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

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