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

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

Change-Id: I095efc5d33f5f940bde90d418dd6f82aebce5ddf