Merge "Remove trimmed api versions file" am: 2c21341e am: e5a747dd am:...

Merge "Remove trimmed api versions file" am: 2c21341e am: e5a747dd am: fd97d83f am: 51f7de9a am: 4c6101a2

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



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