[automerger skipped] Merge "Use std::optional for @nullable (AIDL)" am:...
[automerger skipped] Merge "Use std::optional for @nullable (AIDL)" am: b08a7a49 am: 25a9ba1b -s ours
am skip reason: Change-Id I2c801e3b69f2f8ccf44267f15cbf79e1d8fbf19e with SHA-1 2d5878e6 is in history
Change-Id: I27cc0adea6052116741a16471eeff998ab7b0c71