Add a new version of ComposeDevice

to include displayId to support multi-display
Test: manually
Change-Id: Id1422b9d770d7e7414812ffd2c0ceb552a67c292
1 file changed