Merge "Use std::optional instead of std::unique_ptr" am: de5e40df83

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1501893

Change-Id: I14a094a961030a3a485caebe89b364a972084afc