Merge "Fix ITS Manual Test validate scene issue" into nougat-cts-dev
am: 633ab068cd

Change-Id: I39c7c1efbea4d647c38c9bb75a3cde18c9398ebe