Merge remote-tracking branch 'goog/upstream-master' into MP-SC-07 am: 66d171745c

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

Change-Id: Ib824721d21390e244adaf3b83b0b0de0ee761e2d