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

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

Change-Id: Ia7302a3940681a3ea128475651e536516121df31