Merge "Allow for internal types in @hide API" into tm-dev am: cc3898c6 am: 142eb1b0

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



Change-Id: Ib1fd482a446759ed3b5cc8cb204cd241ad7ddea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>