am b0bc8368: am 3011f645: Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev

* commit 'b0bc8368f53e80236026e54311f2dda7b662c664':
  Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up