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

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

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