tree 1f037ff4157a8b5034dbd01ef2d0d9d7a156fb72
parent 5b7df8b23daa6000a04ba680f5d5979df6fd2560
parent 70c7d0bfbebacd8ff6d1a812f327e66eecc1f4bc
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1695752163 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1695752163 +0000

Merge cherrypicks of ['android-review.googlesource.com/2743096', 'android-review.googlesource.com/2760065'] into androidx-room-release.

Change-Id: Ib8bfd958e210ff375b576ca024523418e7f0b152