Merge "Generate an api-versions.xml from stubs jar" am: dad3c928d8 am: 36ba538606

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

Change-Id: Icf0aefa0084a5a76f3c7fda4775edca04eaa9433