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

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

Change-Id: Ic2285fcd070cf29a5bef40987424a460d4345114