Merge "Temporarily move unused APIs to the blocklist." am: 9f42b2859b am: 44b82b41b5

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

Change-Id: I73a1bd026732fd99b7726dcd1d712960e6db96f2