[automerger skipped] Merge "Use correct calling identity during camera permission check" into qt-qpr1-dev am: 197a9ad1d3 am: e45598e00d -s ours
am skip reason: Change-Id I5318fbb4426bec1448ecc398c86ea96500bb3189 with SHA-1 f7824ac70d is in history

Change-Id: I20f0d36273fe1f5a66133c4a7c27adb92d4dd88f