Merge Android 13 QPR1 am: 17d98471e3

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

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