Merge "Add overriding method of a default method to signature files" into main am: e4f8c858c0 am: 1ccd9fa657

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

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