[automerger skipped] Remove unnecessary @Deprecated on parameter of deprecated method am: 47eda28854 -s ours

am skip reason: Merged-In I4a9b41ac1a80d1c3461a571761a826cd096ef551 with SHA-1 0d7eebc9f1 is already in history

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

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