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

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

Change-Id: Iec5ade750354bd54c2596d9900b198e078b99db1