tree c91031f0eff395fb55a6d09a79eac45f4884b3f9
parent 5549496184d9111aed9d9c3033b2373764d3e88d
parent b48956ee2ea223f749f8c4710b154ced21f4f2a3
author Bill Yi <byi@google.com> 1641579382 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641579382 +0000

[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: bd1bcc2ed4 -s ours am: b48956ee2e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6ce2f36c1c49515f1468feab90fa693d62e52b89