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

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

Change-Id: Id13fa4dbedc465f87eb1c027db774e74bbee5414