Merge remote-tracking branch 'goog/androidx-platform-dev' am: 0dc99ac82a am: 37d4fcdbfe

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

Change-Id: Ia0f9c71a5856f8bd7499c59801bc4da2f7493b17