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: 30f7b090
Change-Id: I68031a33734a607d0fcafa7378b089e3be44e875