Merge "Camera: Camera3Device: Fix off-by-one error" into qt-dev am: c3f0e69568
am: b1e3b30946

Change-Id: I6cb59104c95c4491fcdd97730d6e4579ad698599