tree 142b8e1d73fb92c1393caf3aa24f844034c74116
parent e43582e6622a43e70cc3ac5340bd2706bb1a3c30
parent 8cbd615db4762d570bf40ae71ad9ef94423481e9
author Alexander Dorokhine <adorokhine@google.com> 1616570628 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616570628 +0000

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

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

Change-Id: I26362065d1bf7470cce38832b3de7b899123e469