Merge "Partial revert of cl/170369554 to fix video call ringing screen" am: 589db3a4b3
am: 3502faa3be

Change-Id: I95a743a297fca6c656daec8d3f5cac269c2f5ff8