Merge changes from topic "presubmit-am-8d4fff7234f1447ba2bf0deeff1152c9" into sc-qpr1-dev am: 4bb9f4a312 am: e59511eba4 am: e3d6ef2f8b

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

Change-Id: I60fa22a0feaa63f0738cc20e418e80e78ed7c310