[automerger skipped] Merge "Fix PermissionMonitor issues" into qt-dev am: 97baed2635 am: da3653268c -s ours am: 2f598ffa9b -s ours
am skip reason: Change-Id I8b03c9e23ffc9ff46264d6307fb841a7eda76a76 with SHA-1 92079abc2d is in history

Change-Id: I972cb163c648ff9f426402dfee041a0ebd31f8ec
tree: ae977bcd1634b9cd2bb7ae7c47c7f1303454e75a
  1. core/
  2. services/
  3. tests/