tree b6f19f93feb9c255e8247f7c096bd41a0a737d26
parent e0fa1e694c7eb6de817f56c6a4cce680a6268731
parent e297b1b825144dd5277a31c83539c035f6c1ff84
author Alexander Dorokhine <adorokhine@google.com> 1621419696 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1621419696 +0000

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

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

Change-Id: I5cb29954e2494575cf6ded18716e6e6e35f4b366