Merge "Make current-api-xml use generated current.txt" am: 3ab2ebfe26

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

Change-Id: Iae67a72df5038a527b2b704fe171c352a70d9bd6