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

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

Change-Id: Id950c75049b286698c8264be057c64d72ba91183