Merge "Snap for 15216785 from 50738a06c2e18414eb8c456ea4e29673b997442b to androidx-car-app-release" into androidx-car-app-release