tree 3e7cd062edfe951a39705a75908e658c2f721f73
parent 63e639710cb131bf93699fc409299724ede9b473
author roldenburg <roldenburg@google.com> 1507570325 -0700
committer Eric Erfanian <erfanian@google.com> 1507573935 -0700

Partial revert of cl/170369554 to fix video call ringing screen

Tracking bug to fix the refactoring: http://b/67512378

Bug: 67470678
Test: manual
PiperOrigin-RevId: 171553078
Change-Id: Ib83e4240d6024347f97d246f9b526c3ccbf02057