tree 28fec0e533e72f993e6e183af3675d87a1462d59
parent 7df7c5852ee3b7ba9fb6998088e2eb99537db222
parent 4f874a169032dc42cd719159cf7e07ba58c0663d
author Alexander Dorokhine <adorokhine@google.com> 1624356590 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624356590 +0000

Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: b7ee27c61c am: e448a1cf86 am: 4f874a1690

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

Change-Id: Id950c75049b286698c8264be057c64d72ba91183