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

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

Change-Id: Ic88b75609f8c18d0222e9faa3b21b72e61fc4e72