Merge "Add tests for VtsHalConfigstoreV1_1" into oc-dr1-dev am: 5ce5c63ab3
am: 98afecaa91

Change-Id: I04e160841d2120f6a121cc329cfb6ea0897f5d93