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

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

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