Add ALPN support to SSL socket factory

This adds the ability to use Application-Layer Protocol Negotiation
(ALPN) through the SSLCertificateSocketFactory. ALPN is essentially
like Next Protocol Negotiation (NPN) but negotiation is done in the
clear. This allows the use of other protocols on the same port (e.g.,
SPDY instead of HTTP on port 80).

Change-Id: Ie62926b455e252c4c98670bbbecc1eb5c6f13990
Merge "Add ALPN support to SSL socket factory"
Track libcore API update.

Bug: 3484927
Change-Id: I22fc7e003c3483a20988e91d2b8824626ec022b1
Merge "Track libcore API update."
Track libcore API update.

Bug: 3484927
Change-Id: I684d724000d09a52c840076fab5985242c77c908
Merge "Track libcore API update."
Track libcore API update.

Bug: 3484927
Change-Id: I77c22d3da7b70d3dae4cf6c1903add948ae39406
Merge "Track libcore API update."
Switch frameworks/base over from @hidden Charsets to public StandardCharsets.

Bug: 3484927
Change-Id: I5d136d2ee629588538602766a182ae14ce5fc63c
Merge "Switch frameworks/base over from @hidden Charsets to public StandardCharsets."
Track libcore API change.

Bug: 3484927
Change-Id: If49d0389e4ecb826052e168e070b673894d91318
Merge "Track libcore API change."
Do not set the network mode differently for LTE+CDMA

ro.telephony.default_network can be set if needed to set a different
value for LTE+CDMA. No need to hardcode preferred network mode in the source code.

Change-Id: Iae65f72a6a3bc31d500c5ecec87368a6f2a5d117
Track libcore API update.

Bug: 3484927
Change-Id: I52a37bdeafe431255034543e0fad5f808955309f
Merge "Do not set the network mode differently for LTE+CDMA"
Merge "Track libcore API update."
Track libcore API update.

Bug: 3484927
Change-Id: I04de17b1191295e3fa874c9e351ae686d9eecef5
Merge "Track libcore API update."
Merge branch 'master' of https://android.googlesource.com/platform/frameworks/base

Conflicts:
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java