Snap for 8359595 from d486aa8e3321544d234a4d531d67469e7f3e080f to sc-qpr3-release am: 3e13bb5f5d

Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/17410620

Change-Id: I9823fc777b194441ef1a5cd3f75baf58148ffbad
Signed-off-by: Automerger Merge Worker <[email protected]>