Merge remote-tracking branch 'goog/androidx-platform-dev' am: 77207b21c2

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

Change-Id: Ie079a5ff065e496fe781fa778061e62bb9918663