Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev
am: d579be0cf2

* commit 'd579be0cf234a35273f79676c102b8bd80e071dc':
  Fix deadlock when showing subtitles MediaPlayer

Change-Id: Ib1c57040e723d534df8243ad48479e9b554a74d1