Forward porting CM10 Advanced Phone Settings

Squash of http://review.cyanogenmod.org/#/c/22186/
and http://review.cyanogenmod.org/#/c/23113/

Change-Id: I3674aa2b4cb6c1386458b8bd95566d43dc8cbedd