Merge "Make current-api-xml use generated current.txt" am: 3ab2ebfe26 am: 18503252ef am: 81a0d7c236

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

Change-Id: Ie0ef20c88773c7ced7c7ef3392eb77f64c040b2d