Merge "Fix getting proper device rotation value based upon valid displayId of multiple display device." into pie-cts-dev
am: 29bfdd72ff

Change-Id: Ie5e370a247c2274ba8befab80e6ae1f5887642ed