Merge "Add structural test VtsHalConfigstoreV1_1Target" into oc-dr1-dev am: 5e5c184750
am: deefa80e22

Change-Id: I99f2003f9aba85ff581429557e899bc04a5f096d