Merge "Adding hidden APIs for assigning Admin flag to users." into pi-dev
am: b662f94c37

Change-Id: I4c3d9e5e95cfafbc2f51e9379b516fa402836fe3