Merge changes from topic "presubmit-am-9b80100c807947fa86867f3f78d50689" into sc-qpr1-dev am: a9cfdf0de1

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

Change-Id: Ice2793bdada71e14f620f7d4561fdf5bf8dec55d