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

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

Change-Id: If0701535ccccba28360e46e1f4870f2cb8dd438e