Merge "Change test number to be 7 digits instead of 5" into nougat-cts-dev