Merge "Snap for 9575062 from f3295e5406e92e3fc224f9188d0aece85e60d93f to androidx-drawerlayout-release" into androidx-drawerlayout-release