tree 73e0127c4f717ac38a8b5e27bfb9ff1a88323313
parent 676813a2416e9b69dad73dcb9ea9d4c0f8783c95
parent 6b1c858c691439f6508924deb62484c772f9abda
author Tim Barron <tjbarron@google.com> 1607764968 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607764968 +0000

Merge remote-tracking branch 'aosp/upstream-master' into androidx-master-dev am: 5129c0360c am: 6b1c858c69

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48fff0f13da9d670c7ccc422104633ca63403a49