[automerger skipped] Merge "Add additional overriding methods to signature...

[automerger skipped] Merge "Add additional overriding methods to signature files" into udc-qpr-dev-plus-aosp am: d543d41b -s ours

am skip reason: Merged-In Ifc1876eb60a4b716f72c86003dc9bea0081e9a4c with SHA-1 96ce72c4 is already in history

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



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