Merge "Derestrict some APIs." am: 22ec4e3269 am: 16b8ac77e5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib54b45221376ca62609682ee97d41e45956f0ffd
tree: 6012f081188ba4795367338cdcaa007d24cec081
  1. framework/
  2. service/