[automerger skipped] Merge changes from topic "aae-camera-rvc-qpr-dev" into rvc-qpr-dev am: 9be7d3cf61 am: b40b50dad9 -s ours

am skip reason: Change-Id I4c5c4975096e1765ea37cc52b9f2d2012792c980 with SHA-1 fd0a21b09f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Car/+/12299275

Change-Id: If202ebf158db72e661f8bc6078258dfd842f52f0