Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: 8cbd615db4 am: 39838bec30

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

Change-Id: I0224154eaa81ff7300c7eba6ae7731ba4bf1f825