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

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

Change-Id: Icb900741395045bb16853cc18cf5aeafa4ef08d2