Merge "Snap for 7944853 from a77d142ee0f3a7849e63ef368ed1f4c5a01e5e63 to androidx-core-core-role-release" into androidx-core-core-role-release