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

* commit '018add7e3312be1828dbf062e4e5c45cf59b7ad1':
  Camera2: fix video stabilization test