Merge changes from topic "presubmit-am-8d4fff7234f1447ba2bf0deeff1152c9" into sc-qpr1-dev am: 4bb9f4a312 am: 5b1aab57ec am: 1034313e6c

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

Change-Id: I2318a7f42f740ab13b9c715f7ebabd0ac8223512