[automerger skipped] Merge "Fix PermissionMonitor issues" into qt-dev am: 97baed2635 am: cd35d79a7c -s ours
am skip reason: Change-Id I8b03c9e23ffc9ff46264d6307fb841a7eda76a76 with SHA-1 53b38ab96b is in history

Change-Id: Ib3e46e93903aa5c923faed520d240d04e3154a91