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

Change-Id: If7e46b80622d870374caf8bebaed6d213d9fa6ba