Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: c586b8680c am: e297b1b825 am: 9c1a92cba5

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

Change-Id: I39cf9751bfe484ca3bc6d5d88789609313be11f5