Merge "Don't save policy file for every notif channel creation" into qt-dev
am: bedb3ea687

Change-Id: I2531917034d86bd0332ab6cf1f2ab3a60b5fca3d