tree 1a754b5ff51679f37fde34f5f5f6e8a9cb300643
parent 31701238657bce45d24f1ade24c763370bd70c35
parent 02a9288150919f22e47139a8a1e06b757f5b5f7e
author Alexander Dorokhine <adorokhine@google.com> 1624307860 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624307860 +0000

Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: c586b8680c am: e297b1b825 am: 9c1a92cba5 am: 02a9288150

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/14505837

Change-Id: Iffe0aaf975dcc91449391a322841323b57425780