Merge changes from topic "presubmit-am-c3799ccb0029437e82eea4be764c8e94" into sc-v2-dev-plus-aosp am: b1fd3c09e2

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

Change-Id: I23a039139c4c9e63fada4f6610bcb77fe34f4312