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

Change-Id: I1a342c7f85a75d6a66296455fabad769a133a89b