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

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

Change-Id: I4a9227e5495ab54701e737b459e1518470e950bf