am 02616ac3: Merge "Remove extra code which set Activity to null." into klp-dev

* commit '02616ac3814e92b28123595ed0883780cde30125':
  Remove extra code which set Activity to null.
tree: 3db9c9ec40f56a5333a9a0d3d99500bcf3f20bc2
  1. InCallUI/