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