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

Change-Id: Ibef5a2feb793c9bc086f8e3c36ace6692e565dc6