Merge "[DO NOT MERGE] Add a configuration to allow disabling auto-suspend" into qt-qpr1-dev am: d763ea1f09

Change-Id: I33ef64acc420ec059b669acd45d7eb4f6bb1810f