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

Change-Id: I65bea4faf799ea1b5d02ff1c4c514485f174ff1f