tree 3ee0521484fdb3fc182db25009e8953abb378364
parent c586b8680c677fe5951d6de80fd89a98eaa46de9
parent c2d7a0a93ed348d957b41bbff62b861af32c1eb8
author Alexander Dorokhine <adorokhine@google.com> 1622170907 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622170907 +0000

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

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

Change-Id: Id13fa4dbedc465f87eb1c027db774e74bbee5414