Merge "Enforce read privileged phone state on  get{Voice/Data}ActivationState"
am: 6ae7906a83

Change-Id: Ifc49431b4748bbb1d7349eb58c608421f6c52e98