tree bb8f3a50c6ae3087796b1abae1c313d7c6ad8878
parent 4cdb6a8f57b6e04699c86f1449db1d855eda257a
parent 2a9017f754c604f119afbf218b8d007f47cb3122
author Alexander Dorokhine <adorokhine@google.com> 1605130694 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605130694 +0000

Merge branch 'upstream-master' into androidx-master-dev am: 2a9017f754

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

Change-Id: Ia0610e3a3f8a8111f84c27f88e8a04ffd8337aee