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

Change-Id: I559fc7bb24d8fd875c549e9efd378d0b64575bad