Merge "DO NOT MERGE: Move CurrentUserContextTracker to SystemUIModule" into rvc-dev am: 13fb1df163 am: 64bc69501d am: b757b9c050 am: 6d25318e0a

Change-Id: I270ac39bbb179f8c1205e8d481bc9e513a9e7725