Merge changes from topic "presubmit-am-ede2f87240324d9782e0037b42875244" into sc-qpr1-dev am: b0b4c71975

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/libs/+/16101707

Change-Id: If8ba4c94758fc1533499e37d458cfd97d322d1be