Merge "Follow split of DISALLOW_TELEPHONY" into lmp-dev