Merge sc-mainline-prod am: 529551e130

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

Change-Id: Icfb971b1120aa98b41ddda05d131f66e501af1ac