Merge "Derestrict some APIs." am: 8e97fea3c2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I673b9bcb6fbc35f601ca017fafa7ca2ac53f5f61