Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: 46325e158d am: 191864b1de

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

Change-Id: Ib26ba5b1fd95f694fc3768279221b9cbeb1feff2