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

Change-Id: I70c88741ef0a231b4a96a3cad7915cbb8cd0012d