Merge "Merge "Expose Display.getType() via TestApi." into rvc-dev am: bd745f763a am: 8122a3938e am: 765796be05 am: 71150734c9" into rvc-qpr-dev-plus-aosp