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

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

Change-Id: I801c66b783c4db4569810ec1643ef8cf42ca1f22