Merge "[automerger skipped] Set dist_group: "android" for external/apache-http java_sdk_libraries am: 199612e35c am: f4411f95ba -s ours am: 33874ef696 -s ours" into main-plus-java-next-dev