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

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

Change-Id: I5f77212d5a09851aad580e8f65c03965394bb2b3