Merge "Camera2: fix video stabilization test" into marshmallow-cts-dev
am: adfddc122c

* commit 'adfddc122c709a85ac9a75ba0a9fcdf7c17aca18':
  Camera2: fix video stabilization test