Merge "Remove trimmed api versions file" am: 2c21341eea am: e5a747dd3d am: fd97d83f11

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

Change-Id: I1460065a0021002cd1fd2467efd7eaef020b66c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>