Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: b7ee27c61c am: 57bbdbfdb1 am: e3a5f1debd

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

Change-Id: I05d4ce05be6c467194f3afaf450a06088aed6b2e