Merge "[RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC / Camera interaction" into qt-r1-dev
am: 33c07d1c38

Change-Id: I49fa5aa1d3e26eba04eac271c20e4b624e0c9019