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

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

Change-Id: I33f9877e9d4510a356f79c25b0c1d724ced629c0