Merge changes from topic "presubmit-am-484f8d005d234c1badd5d2da7cb8abf0" into sc-qpr1-dev am: c9fa09bbff

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

Change-Id: Idb556ede8f7ef54eba894c87024fc9e60b644152