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

Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2784259

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