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

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

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