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

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

Change-Id: Ica94dea77315cf338b06254c453f0a0ed09bb8b7