Reconcile ag/28289126 and aosp/3196355

Bug: 354106365
Flag: TEST_ONLY
Test: atest CtsApacheHttpLegacy27ApiSignatureTestCases
Change-Id: If8d15548c5ca1d484100dba34702d347562b3333
1 file changed