Merge "Enforce READ_PHONE_STATE for getCallState APIs" into sc-dev