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

Change-Id: I9b4a60017a5e2273e572d90929d269e31352b5a0