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

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

Change-Id: Iacc5530351d2c2ccec0e9cf9aa68ac7f5ffef8c8
Signed-off-by: Automerger Merge Worker <[email protected]>