Merge "Switch aidl::nullable to std::optional" into rvc-dev-plus-aosp