am b547c5e9: Merge commit \'ec9354f7\' into manualmerge

* commit 'b547c5e90d59be0ba823b54eb44e235bce53b598':
  DO NOT MERGE Fix IllegalStateException in InCallUI
tree: 64f1e2914e2ad46dfb459aa6198da31eb50fa459
  1. InCallUI/