Merge "CDD: Remove physical display size requirement from VR High Performance." into nougat-dev am: cae8481f23
am: 6500d6a2f4  -s ours

Change-Id: I55e2ab0c8b2cda346e1f79b126479bf85c80d736