[automerger skipped] Merge "[DO NOT MERGE] Add a configuration to allow...

[automerger skipped] Merge "[DO NOT MERGE] Add a configuration to allow disabling auto-suspend" into qt-qpr1-dev am: d763ea1f am: 7146b7e3 -s ours
am skip reason: subject contains skip directive

Change-Id: I7ec86166b9b3b95171bc9e62ac85c6d105a8dd71