tree e2ca3f43ecf503188781a45d2817d0c82ef64349
parent 24bcdd3bdb1a081de0ece46ac94299603ab026e8
parent 270bcc4eb4f2e1bce86f209b1b8b9c20cecb1f58
author Tommy Chiu <tommychiu@google.com> 1658514875 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1658514875 +0000

Merge remote-tracking branch 'goog/upstream-master' into D2-TM-011 am: 263a13fc6a am: 270bcc4eb4

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

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