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

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

Change-Id: Id87feb4e3b383d6f19151ab50b93d90d8380243d