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

Change-Id: I0924d71b202109bad8e43a7c5160b05ac6c5f238