tree 1a754b5ff51679f37fde34f5f5f6e8a9cb300643
parent 3a041c88222e360f4ff997a1c639d6bf07ad337f
parent a923473f1d2e74c23bfb6acc35e194b10dba2277
author Alexander Dorokhine <adorokhine@google.com> 1624306641 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624306641 +0000

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

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

Change-Id: I3579e723d2e3c6cf05ba209aabdf644d377669ef