Merge remote-tracking branch 'goog/androidx-platform-dev' am: 77207b21c2 am: 8c8e24e373 am: b5bd5e565e

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

Change-Id: I082181076fcfc16d527339cb199498399e054ae2