Merge "Merge "Modified camera framework stress tests." into qt-dev am: d6c8e026 am: 0e54f481" into qt-r1-dev-plus-aosp