Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: c586b8680c am: 8541fa7a31 am: e102320065

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

Change-Id: I46900f85c83d3ff3943c1f9e185bca75abd34d53