Merge "Merge "Code Patch for camera preview switch tests" into nyc-dev am: 5c950a8078 am: e6880cbef9" into nyc-mr1-dev-plus-aosp
am: dee676b3f9
* commit 'dee676b3f95639963ed5dced5b725c7afd5d30f4':
Change-Id: I0322cd6638c18c71be8a050a2cf0578d03e30ff2
This commit is contained in: