Merge "gralloc4-vts: correctly instantiate std::optional" into rvc-dev am: f1b3ea2398

Change-Id: I10920c33cbd1df5b931714cf2c3fd202852a3b03