Move Sim Cards section under Wireless aka More

- Not sure who's idea it was to add sim cards there but it was clearly a bad one.

Change-Id: Ibde9d9891984d233ca132a55b92f5cee57a6aa42
Merge "Move Sim Cards section under Wireless aka More" into lollipop-caf