Merge "Snap for 11427105 from e8af3d8a3763dab1004327d77c3928d0f2a07bcb to androidx-browser-release" into androidx-browser-release