Merge "Hook up AOD knobs to Settings.Global" into oc-mr1-dev
am: 67594c6f54

Change-Id: Ifbb83939c2c2c30048fe43b2092b2afe4c3b234c