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: 6431ba8d

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



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