tree b6f19f93feb9c255e8247f7c096bd41a0a737d26
parent e10232006535c7c7aa5b9e7907adb6d2e91fbf7c
parent 57bbdbfdb1783aaef34b0db077ed2a91ad12f3d5
author Alexander Dorokhine <adorokhine@google.com> 1621045612 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1621045612 +0000

Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: b7ee27c61c am: 57bbdbfdb1

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

Change-Id: Ie65fe328e28d920a632a0500379c735b2415d10f