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

Change-Id: Ib1a295ed4de405ce8fc30d53a4334ef1ed2005e6