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

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

Change-Id: I5459bb5b6cc8741b1128822fa9d5d1a11515df5f