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

Change-Id: I3e0dcf34a4f08e11fbfbed15341ecfc53cdcac0c