Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: 46325e158d

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

Change-Id: I3fdd37ea1e7d1750b0fa6f67a44b51108c542f90