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

Change-Id: I5af6639f4fcd476ea28b73ddb96930a83cd5d7df