Merge "Snap for 8517803 from 9bfcb851c99aca018ef8a97b410ee8610a376ea5 to androidx-core-core-splashscreen-release" into androidx-core-core-splashscreen-release