tree 1a754b5ff51679f37fde34f5f5f6e8a9cb300643
parent 6b514de34693827f86c034437fe229e1896efd66
parent e0fa1e694c7eb6de817f56c6a4cce680a6268731
author Alexander Dorokhine <adorokhine@google.com> 1624306645 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624306645 +0000

Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: b7ee27c61c am: 57bbdbfdb1 am: e3a5f1debd am: e0fa1e694c

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

Change-Id: I5aef8b90c339c2f983c615ab15b4c199b310b259