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

Original change: undetermined

Change-Id: Ifbf649227c97e53da5a0807d6c172da1a6b538a7