am a9993958: Merge "More Telephony Feature checks" into klp-modular-dev

* commit 'a999395810202e20edd3d5b5e7f6bb538303ef25':
  More Telephony Feature checks