Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: c2d7a0a93e am: ba0008abe8 am: 762e61be43

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

Change-Id: I5f68a628a6f84e98cb1292f1085c64500eead474