Merge "Move deviceinfo test package to sdk 26"