Merge remote-tracking branch 'androidx-platform-dev' into master am: deed1c7dfc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0030dee1f549a4404e395ec1a17282810a6fe63a