Merge "Derestrict some non-SDK APIs." am: a8e0a85d40 am: 0dd893cb28

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4eeffeb0d9ab509e2f436435bf2079558e2d1c7d
tree: 3dbd778ca7bbf50a5ee52da52b21f3c8234e53b8
  1. framework/
  2. service/