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

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



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