merge changes from m-wireless

Change-Id: Id93b2d6e840baaa0b9b42b4595bca0dc41972994
tree: 486b069d531d607cc431e16b874f1a24025dc60e
  1. InCallUI/