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

Change-Id: I36fd15a3ccf7fb43019f40519fbae58ae9f8cfa0
tree: f093da93b49eec5f3f3a6778526e7efda222a286
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE