Merge "Use std::optional for @nullable (AIDL)" am: b08a7a4997

Change-Id: I1004fd7a0c2e3fda7906e232913d25e4059b3f9f