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

Change-Id: Ib1052e2bc4c1f5f175fa5c27bb348c3673ed1051