Merge "Expose Display.getType() via TestApi." into rvc-dev am: bd745f763a

Change-Id: Ie0fb340288decd887a9e47f7626c43c0ad2290e2