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

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

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