tree 5a7de1cf47cd96ed02a2d40a05a61a5dc654cb60
parent 6d9bad0a96be5f5582ff685ca256f3f154163c43
parent ff7e950840eb922f67f4d542478e35bc80069e0d
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1627417724 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1627417724 +0000

Merge cherrypicks of [1780150] into androidx-datastore-release

Change-Id: I8f32b913132ff0aaaf330f67323af399afc9ea28