tree 1a754b5ff51679f37fde34f5f5f6e8a9cb300643
parent f27d32691f43583411778756bccbaa5c54db0c5d
parent 529551e1304c1febbc59f1d6f2262892638de211
author Xin Li <delphij@google.com> 1624306667 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624306667 +0000

Merge sc-mainline-prod am: 529551e130

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

Change-Id: Icfb971b1120aa98b41ddda05d131f66e501af1ac