Merge "DO NOT MERGE Fix CTS test for getting proper display device information (i.e. DisplayDevice and display size) from the multiple display device." into pie-cts-dev