Merge "Add VrFlinger dumpsys to SurfaceFlinger" into oc-dr1-dev am: ae11e71bb7
am: 9579e3cd94

Change-Id: I3f56806205f651d714255c66a1b1bd8e0cc73f6d