am 5800fe0e: Merge "Don\'t test Telephony specific features for non-telephony...
am 5800fe0e: Merge "Don\'t test Telephony specific features for non-telephony devices" into klp-modular-dev
* commit '5800fe0e':
Don't test Telephony specific features for non-telephony devices