Reconcile manifest w/ CM

Change-Id: I5b16d6f4fb029db6e01e138caf787a22a95c918c
Revert "Telephony-Available Networks: Add up navigation to the action bar as well"

This reverts commit 89ccb74e9c5a7f774e00e8cbc3857772ee393240.

Conflicts:

	AndroidManifest.xml

Change-Id: Ib5006e24cee980ebf4271443019f4f875e310a67