Merge "Make the system-current.txt available for use by /vendor tests" into main am: c166acd5b2 am: da399151cc

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

Change-Id: I4849fcd9ab11ed23d25b7daf61b8f205c33b858d
Signed-off-by: Automerger Merge Worker <[email protected]>