Merge "Move api/*current.txt filegroups into api dir" am: 97165aa09e am: 39ce253f05 am: e206b228cd

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

Change-Id: I8a9dddc727506e820e8bce5b43f109f787ffedae