Merge remote-tracking branch 'androidx-platform-dev' into master am: deed1c7dfc am: e43582e662

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

Change-Id: I40be81bd0c734e05ed735dcf79b4b78247cc3770