Merge "[RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC /...
Merge "[RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC / Camera interaction" into qt-r1-dev am: 33c07d1c
am: 99b8fb75
Change-Id: I32d6d0093e1c52b5e7ceaaae2b304a61f6269257