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

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

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