Merge "Move temp blocklist APIs to max-sdk-r list." am: f5f4d792cf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0376c4825c8ef7577be1192069e465167affdcd