tree adbeb2aabcf43b95ec981bfde8278d08ded9c799
parent 6edf2a90427f19cf6219e9222efe43eacf4a254c
parent 0c97200cfaced9cd6632fce6ebfdd2713add9cb8
author Tommy Chiu <tommychiu@google.com> 1653554375 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1653554375 +0000

Merge remote-tracking branch 'goog/upstream-master' into D2-TM-008a am: 9b38d2e14c am: 0c97200cfa

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

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