[automerger skipped] Prepare for keeping concrete overrides of abstract methods am: 827b162acb -s ours

am skip reason: Merged-In Ia4e7977ae8cfefa15612b45dca33fd6007c27e5d with SHA-1 837aa6961b is already in history

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

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