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

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

Change-Id: I5cb29954e2494575cf6ded18716e6e6e35f4b366