PhoneCommon & ContactProvider: track "stable/cm-11.0"

Change-Id: Iac1a36f2f0ade1453406d6d17bc8ca2c1631a6ac
Manifest-PhoneCommon: fix typo error

Change-Id: Ie6286da3331bb5f19d0cb745d8c2877e4f684061
Merge branch 'kitkat' of https://github.com/AOSPA-legacy/manifest into AOSPA-legacy-kitkat

Conflicts:
	default.xml

	modified:   default.xml
Merge branch 'AOSPA-legacy-kitkat' into aospa-legacy