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

Change-Id: I36d46470bfebf61f72d34a86350652714b2e0cf1