Merge "Prepare for keeping concrete overrides of abstract methods" into main am: dde1797b4a am: e49ecec3de am: 886f90f3f2

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

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