Merge "Remove unnecessary @Deprecated on parameter of deprecated method" into...

Merge "Remove unnecessary @Deprecated on parameter of deprecated method" into main am: e1c5b52a am: 6d0fbbcb

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



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