[automerger skipped] Merge "Add new intent launch button in dialer test...
[automerger skipped] Merge "Add new intent launch button in dialer test activity" am: b7f7f081 -s ours am: 80fd62c8 -s ours
am skip reason: Change-Id I32e44eb3d26fe82f7acbb82d93eaee1377216086 with SHA-1 04d7877f is in history
Change-Id: Ia1a9f1534e380e350aee09c545c4474f4f277968