Merge "Add additional overriding methods to signature files" into udc-qpr-dev-plus-aosp