Merge "Derestrict some APIs." am: 8e97fea3c2 am: 4651bc7b96 am: 6b93271842

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I467147251bf2f581bc3c5bbb823324660bd935fe