Merge "Derestrict some non-SDK APIs." am: 29bf6e8443

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a073e1413b1e7bd62be3a865230d19db81b4726