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

Change-Id: I8621817108e2eaa150d844804a0aa46974fac54c