Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: c586b8680c am: 1601eef22f

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

Change-Id: I47044a1a507483b1ae3b318231e575379ebb1af7