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

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

Change-Id: I0da722060795a5fc2eb8774588acf41020b08e8a