[automerger skipped] DO NOT MERGE - Add flag to turn on/off the headless user...

[automerger skipped] DO NOT MERGE - Add flag to turn on/off the headless user specific blacklist/whitelist am: 81ce02f5 am: 26905ee0 -s ours
am skip reason: subject contains skip directive

Change-Id: I9f696338d578b17cf396fe639cd8894067d6bc7b