Merge "Merge Android 13 QPR1 am: 17d98471e3" into stage-aosp-master am: 6c18b3980e

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

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