tree 3ee0521484fdb3fc182db25009e8953abb378364
parent 9254a851d329edc6adc780656519b326148649b5
parent 762e61be438c8f6257582b67ad23e979e59f6b02
author Alexander Dorokhine <adorokhine@google.com> 1622174819 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622174819 +0000

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

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

Change-Id: I5f68a628a6f84e98cb1292f1085c64500eead474