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: If5588d2fb4a3b41becf5338b44fa57c784bff60b