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

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

Change-Id: If7830de309165c524c22a9dd33fc0535e215651f