Merge "Add SDK extension versions to dumpstate header" am: f91ec23510

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1675877

Change-Id: Ifbae14434666bf2cc735a69e3b73396242ebc847