tree a109f230607d17edee61beac8e5b4139a5eb1b74
parent 57ce5831872f841cae84b39e3fe5101d9e1c18e3
parent bef3c12e4486a2ebf5dcb305ce399085f0d1200a
author Tim Barron <tjbarron@google.com> 1610746147 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610746147 +0000

Merge remote-tracking branch 'aosp/upstream-master' into androidx-main am: bef3c12e44

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17be4f154ddff5226c0dba7fad29a6b0f4288829