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

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

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