Merge "Remove extra code which set Activity to null." into klp-dev
tree: 3db9c9ec40f56a5333a9a0d3d99500bcf3f20bc2
  1. InCallUI/