Merge changes from topic "presubmit-am-484f8d005d234c1badd5d2da7cb8abf0" into...

Merge changes from topic "presubmit-am-484f8d005d234c1badd5d2da7cb8abf0" into sc-qpr1-dev am: c9fa09bb am: d66d7d44 am: b3af124b am: db63ef76 am: 1aca650f

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

Change-Id: I21961e4705451b3c6972f2ed8ab83fae9edce59f