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

Change-Id: Ic9767915d326b674b0ef3ab21cbc9bf280115121