Merge remote-tracking branch 'aosp/upstream-master' into androidx-main
* aosp/upstream-master:
Update Icing from upstream.
Descriptions:
========================================================================
[fixit] Remove incorrect reserve usage for STL data structure
========================================================================
Move LiteIndex::SortHits() from the query path to the indexing path
========================================================================
Bug: 286418010
Bug: 297549761
Bug: 248295995
Change-Id: I6fcfd150036dc47a42181dfa14b410220da93d31