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

[automerger skipped] Merge "Add additional overriding methods to signature files" into main am: 35863731 am: 8054883d -s ours am: a85e9495 -s ours

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

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



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