Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: c2d7a0a93e am: ff7508e7a7

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

Change-Id: I77fffb00a0bc80bed122ba436f22af629aa4f87d