[automerger skipped] Fix check_initial_reg_state packaging into VTS. am: 45778d28af  -s ours
am: e7086823fa  -s ours

Change-Id: I1b84114a68a088c2869d6388fe31374d77f5706a