Merge "Add uniqueId to Virtual Display and pass through to inputflinger (2/2)" into oc-dev
am: 02207005fa  -s ours

Change-Id: I94e6f135f5e49d1514354ae326075ea4bca496f3