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

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

Change-Id: I21054f38bb95966580d350663d87d85e6bee5764