Merge "Release virtual display hwcId during vr mode transition." into oc-dev am: 5d6d98a1df
am: d940f0c808

Change-Id: I386d5b397e26d3c177abc11f07a931315e61506e