Merge "Fix: [SystemUI] icon_blacklist is not reset for sub users" am: e8465e8480 am: 24c969b16d
am: ada90d75a5

Change-Id: Ia8e1b75b1e1ff9ff723eec701e97d4e7b9c2ca4b