Merge "Add timeout for setPermissionGrantState" into qt-dev am: 3baa0b34e3
am: 155cb7c247

Change-Id: I2313f9c920058dd3347de0c4087b09d24813fa8f