Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: c2d7a0a93e am: ba0008abe8 am: 762e61be43 am: a923473f1d

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

Change-Id: I3579e723d2e3c6cf05ba209aabdf644d377669ef