Merge "Snap for 7927759 from 4b95116a8963880642e243c46cd0150b39872ab4 to androidx-sqlite-release" into androidx-sqlite-release