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

Change-Id: Id7cc172bae46f53fabdf9b9520d417e951f3249f