Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: b7ee27c61c am: e448a1cf86 am: 72a884f79d am: 56fb7c1591

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

Change-Id: Ie4be151f0bcfd3cc74d71d32d8309efd2acbebd9