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

Original change: undetermined

Change-Id: Ie8ac640400e1de5c129cadff1b3e87936e582002