Merge "Snap for 6600560 from 696f76f1d7a523ae9663ebecd7035e459fe89d19 to androidx-sqlite-inspection-release" into androidx-sqlite-inspection-release