[automerger skipped] Merge Android R am: b68ac114f8 -s ours

am skip reason: Change-Id I11c4aae11395a7bf8f92574af746f7af3687a216 with SHA-1 f48ff0ad05 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/services/+/1422397

Change-Id: If768e6a8abf4bc0af8acda215b95d1fe86bc417b