Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: b7ee27c61c

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

Change-Id: Ie88621a5257f1189b2992b70142b034589869624