Merge "Move testapi API files for symmetry with others" am: 78d5048610

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

Change-Id: Ib3372ff7001df05aaeb96664c7531348854740be