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

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

Change-Id: Ib05a4f48b25d8d70875bb3b97510b2ef1dd051cc