Merge 70224c539cb74b69ad1ea912cce78337118aa5c2 on remote branch

Change-Id: Ibc8895c01e84b7ae3a2e97e14ffac6e86706c13b
Merge 32c38aa192a906f52dbd55097466813d233ff439 on remote branch

Change-Id: I8f7324c36555ff91e434ddf0ef07ac9413aac15f
Merge 2815177d5e6556f2948a44d5ee1eb303edea9a1b on remote branch

Change-Id: I6140c5532251c5ddc7dfa98f49bfb72b9411c71d
Merge 726b437c5358f9f015b8147368956a064613e2e0 on remote branch

Change-Id: I4adf052300ed634365db7612644eee05a45549e1
Merge "Merge 726b437c5358f9f015b8147368956a064613e2e0 on remote branch"
Merge 3bf131bc98598d08271809a0d30287d5c31c97d8 on remote branch

Change-Id: Ifaa5d20cf4939576c6b9360e23697776064423a1
Merge "Merge 3bf131bc98598d08271809a0d30287d5c31c97d8 on remote branch"
Fix OOBE crash/DoS after receiving 0-byte WAP push.

Add a try/catch block around the code in WapPushOverSms.dispatchWapPdu(),
so we don't get into a reboot trap on receiving weirdly formed messages.
Only catch ArrayIndexOutOfBoundsException, which is difficult to
prevent inside dispatchWapPdu() for 0-byte PDUs or other unusual
contents. The caller should probably catch any unhandled exceptions of other types and log them with stack traces.

Bug: 11967705
Change-Id: Iabfec68d2564dd438d45c80cdba877bf19fa0397
Merge d7c1ee1da3c0c5534b5ac6f17352187eebcd8ecb on remote branch

Change-Id: Iddfccff0f55b1136ee4e778cd1ac453cc1cede8c
Merge "Merge d7c1ee1da3c0c5534b5ac6f17352187eebcd8ecb on remote branch"
Merge d3cd35941fe33c1ad43485ae216144a5e09ffcce on remote branch

Change-Id: I9a10371d13c6de7de918808795f24bf693a5c317
Merge "Merge d3cd35941fe33c1ad43485ae216144a5e09ffcce on remote branch"
Tests: Fix GSMPhoneTest

Clean run of GSMPhoneTest

Change-Id: Ibf5d76de75ba2cb8c3eaa8b976b8f5d65bdf9f11
Merge a2392cfd22f68c0792810d9c55b41e70a1408fbb on remote branch

Change-Id: Ia8a3822f3c6395c71e3c2d2a788f92cdf29b11a3
Merge "Merge a2392cfd22f68c0792810d9c55b41e70a1408fbb on remote branch"
Merge 38470175819b2f89a07e9d36e2bd127c6ff9e38f on remote branch

Change-Id: I08bfc4e693ff3c0efdcbeaa5117d54e1d259dd0f
Merge "Merge 38470175819b2f89a07e9d36e2bd127c6ff9e38f on remote branch"
Merge 1612756a7b4478286c0cba07c38dd45eaf31d7a0 on remote branch

Change-Id: Ieea55dbd8ff58f38c8630469e6dc8628d4f3197f
Merge "Merge 1612756a7b4478286c0cba07c38dd45eaf31d7a0 on remote branch"
Telephony: add the support for Anr and Email for SIM Card

- Add ANR/EMAIL support for AdnRecord
- add the related interface for ADN,ANR,EMAIL
- Support loading part of records in IccFileHandler.
- Cleanup some unused codes.

Change-Id: I282650251b98317a4a2bf59d61adad66a30cc9c9