Merge "Adding UserManagerHelper class to SettingsLib." into pi-dev
am: c7034f7ab1

Change-Id: Ief0abc0585a1b929a45ea78ef5264419f89e9caf