Merge "Merge "Do not sanitize override config for fullscreen" into nyc-dev am: 65f1973ba9 am: 2ae97b4cf2" into nyc-mr1-dev-plus-aosp
am: 93e2672d63

* commit '93e2672d638c2c866364aec9ca0535061fce507a':

Change-Id: I10e0063e98e8b2027e59c08e3308468b16348fad