Merge "Stop disabling the HiddenTypeParameter check" into main am: a595a54e2f am: 37c33149b4 am: 338beeeb95

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

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