Merge "Derestrict some non-SDK APIs." am: 29bf6e8443 am: 9e27f89092 am: 982e50f2c6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab20c244c8ff5b04f3236cfccb453a4fbe5a8705