Merge "DO NOT MERGE: Move CurrentUserContextTracker to SystemUIModule" into rvc-dev am: 13fb1df163

Change-Id: I99b300cfa905fd7d46f1f4bce9cc65033cbcae13