Merge changes from topic "presubmit-am-4dbec88f592b446dae9f9860273b783e" into sc-qpr1-dev am: 69ead21213 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/16938733 Change-Id: I3719af7327b4ed785734f8d2b9f75d0e5a883896