Merge "Remove @Parameters for tests that don't use them." into main am: 2e70f72619 am: f88681beb1

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

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