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

* commit '80a3fbf4082483065d462f0b2b0f5ff8cad22b5c':
  Clear identity when killing media provider.