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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cc168834f1071f807fd403b9a9e770095b4ae06