Merge "[RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC / Camera interaction am: 9971348a0c am: 433ee38af2" into qt-qpr1-dev-plus-aosp