Merge "Add additional overriding methods to signature files" into main am: 35863731

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



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