Merge "Add uniqueId to Virtual Display and pass through to inputflinger (2/2)"...
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (2/2)" into oc-dev am: 02207005 -s ours
am: 3f4a2889 -s ours
Change-Id: I7b33541ec12d134c94b9792cdd8caa969370b4be