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

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

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