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

Change-Id: I83e0f56361908eba30a687cab8c4bddef9831787