Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: c2d7a0a93e am: ff7508e7a7 am: 00d8a9f541 am: 9254a851d3

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

Change-Id: Iafe8a5ec13a047e2552078df4c49ac0095982e69