Merge remote-tracking branch 'aosp/upstream-master' into androidx-main am: e7b69188bb Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2858548 Change-Id: Ib31d172049889444a55c31941ba9f7460d39148d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>