Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev am: 424e328bba  -s ours
am: b52502fd4a  -s ours

Change-Id: Iaa3b7e13b1e5a99875e4698b7c025497c2c2cf02