Merge changes from topic "presubmit-am-5f78b5b6b5cb4653b085e1fa983c7156" into sc-qpr1-dev am: 7a655d6245 am: 3e9c94ebe1

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

Change-Id: Ic93358b0cc671835588833bfbbeaac4f45fcdbb1