Merge "Swap buttons in call forward settings dialog" into oc-mr1-dev
am: 65b07e7458

Change-Id: I8cc34da64ada150d60c16a2b26d6d3bb7a1df501