am fe6964e4: (-s ours) am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev

* commit 'fe6964e4550e88f5cc830b9944db62201b8c8ec5':