tree b6f19f93feb9c255e8247f7c096bd41a0a737d26
parent 1673a404e62704a08cec3e0c1686c37072771663
parent e3a5f1debd282b026d693740a424123ef7227596
author Alexander Dorokhine <adorokhine@google.com> 1621382190 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1621382190 +0000

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

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

Change-Id: I05d4ce05be6c467194f3afaf450a06088aed6b2e