am 46af1cb1: am 3f56a153: Merge "Camera2: modified video snapshot test" into lmp-dev

* commit '46af1cb165e74bf347df984f292b8ce9c19e5be6':