Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: 6bdac48ae6 am: 8a6283ea5d am: 16b1321dad

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

Change-Id: I7834cf39e7c43168d92a4f22db2b568c889db2ec