[automerger skipped] [DO NOT MERGE] Add a configuration to allow disabling auto-suspend am: c594d70268 am: 725479de94 -s ours
am skip reason: subject contains skip directive

Change-Id: I695832b20891d0d3cf1f50192c130f269bf4a884