am c9eb398a: Merge "Clear identity when killing media provider." into mnc-dev

* commit 'c9eb398a1b0d7954b0d4f13fb46cae3042a99a75':
  Clear identity when killing media provider.