Merge "Snap for 9402207 from 435db9f11b09187e0d60683813a28d07cc13166b to androidx-drawerlayout-release" into androidx-drawerlayout-release