Merge changes from topic "vts-secure-only-camera" into rvc-dev am: ec37ce4947

Original change: undetermined

Change-Id: I7f99fe08f74082881ecdbe38daa8b21ebbc8dacd