tree 3b1c1432a171932aab98684ee0a4bdf4577a4920
parent 7c143aefa0e78cdd8046417dcd2b77706b986496
parent deed1c7dfca38166693ea2bd34c2190c8e9cabf6
author Alexander Dorokhine <adorokhine@google.com> 1615089825 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615089825 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0030dee1f549a4404e395ec1a17282810a6fe63a