Merge "Use std::optional instead of std::unique_ptr" am: 85486fc425 am: 17f086a93a

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1501913

Change-Id: I8b3b9a6f271a7b69610e6efb5fa265e395cdff2e