Merge remote-tracking branch 'goog/androidx-platform-dev' into udc-dev am: 67f019aa7c am: 44b77e1c87 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/23539375 Change-Id: I6c79ba7eee53316c895160fe83b58f2af405c611 Signed-off-by: Automerger Merge Worker <[email protected]>