tree b6f19f93feb9c255e8247f7c096bd41a0a737d26
parent 57bbdbfdb1783aaef34b0db077ed2a91ad12f3d5
parent c586b8680c677fe5951d6de80fd89a98eaa46de9
author Alexander Dorokhine <adorokhine@google.com> 1620768808 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620768808 +0000

Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: c586b8680c

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

Change-Id: I1d69f198a851cf9f11458d09ca1cc04b2de1ca9b