Merge "Drop deprecated API lists from csv merge script" am: 269f58445d am: 33afbc9347 am: 3c8464e035 am: da9fd82cd3

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

Change-Id: Ie8bf0007a39430fc6e36b919614913f6727715c2