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

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

Change-Id: I6616a7c98f6339a3fde3ea20e7aa7a8154f540b0