Merge "Slightly tweak the "extract" script." into main am: 97364210bd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3398780

Change-Id: I07f4365f64d2f1cbcbc9ba37a64c230ebc8dfe64
Signed-off-by: Automerger Merge Worker <[email protected]>