am a1965147: am 151274cf: Merge "Fix some frameworks-telephony test compile...
am a1965147: am 151274cf: Merge "Fix some frameworks-telephony test compile errors." into jb-mr2-dev
* commit 'a1965147':
Fix some frameworks-telephony test compile errors.