Merge "Snap for 15614157 from 34685daf33504454afbd087c1f83c48986a6d834 to androidx-sqlite-release" into androidx-sqlite-release