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

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

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

Change-Id: I77fffb00a0bc80bed122ba436f22af629aa4f87d