Merge "Merge "Add min extension versions to AndroidPackage." into rvc-dev am: 46a0a5ab am: 97d5432d" into rvc-d1-dev-plus-aosp