[automerger skipped] Merge "Fix ICameraDeviceCallback version in VTS test" into pie-vts-dev
am: a935e652af  -s ours

Change-Id: I284cdf08e8e6fd59d774d9917a21fd091accac52