Merge "Stop disabling the HiddenTypeParameter check" into main am: a595a54e2f am: e99761f402

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

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