tree 28d2332eb47ec1fb2be536150b2a87b850008fb5
parent e4115fbfb6dbc904c306bbc5fc4548fd342535a4
parent 717b7356710e188ddaed9aa2838a51d7dc1a5a96
author Bill Richardson <wfrichar@google.com> 1619667349 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619667349 +0000

Merge remote-tracking branch 'goog/upstream-master' into D2-SC-020 am: 717b735671

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/14254548

Change-Id: If9e080ef4ca9e6a69d35e93b83c1f0f7d1cd9020