Merge "Add ITelephony setCepEnabled command line command." am: ae48da3c55
am: ec6047ad09

Change-Id: I1bf8d42a2e7874ceb6503f50fb873e59fefdf713