tree 5801a3ed38619739c3d555f40f8037ea5b4cd65e
parent e79c4c614efb9b2209cd09e8660fdff7c3ee61a7
parent 92b1e59edb984eea55f8b1c6d7402b19ef6786eb
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1655706510 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1655706510 +0000

Merge "Merge remote-tracking branch 'goog/upstream-master' into D2-TM-009 am: 4e1fe7bd61 am: 1be7de3c47" into tm-d1-dev-plus-aosp am: 92b1e59edb

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

Change-Id: I680c4aaf9443af774f6f6d1491212f2c99e3e4da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>