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

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

Change-Id: If9fdcac1c8090b50f6f72e928dd4f756a5ae8735