Merge "Revert "Allow CTS DeviceInfo to read VAB prop.""