Merge changes from topic "presubmit-am-d279a3e856094c2c9623ef7cc9a3f4fe" into sc-qpr1-dev am: 43fa3c8831

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Car/+/15958632

Change-Id: Idca93e99d6a8abed628cd828182ada3013bf4fa2