Merge "Update test-current.txt with removed MP APIs" am: f5e95d6a5f am: 4053ff88b5 am: aea67fa8c9

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

Change-Id: I75779815c2042470a70aef25aee9d5aceb62f2a4