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

Original change: undetermined

Change-Id: I11bd0f3806fcd7dfa8cb3f8b8611248350e6763e