Merge sc-mainline-prod am: 529551e130 am: 08c090a47c am: 8239e84881

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

Change-Id: I51fab6f5277a5219524d5191388d9c18db47c813