Merge "Fix call to get the current user id from a secondary SystemUI process." into oc-dev am: 2349481d62
am: 1539f47e44

Change-Id: Ieabaad68e518aa1b5a4c38058c1724d9d2ea6d63