[automerger skipped] Merge "Use std::optional for nullable" into...
[automerger skipped] Merge "Use std::optional for nullable" into rvc-dev-plus-aosp am: 73cf83bc am: f10bf89f am: e94f4a00 -s ours
am skip reason: Change-Id I9045bc6fc2eb06839203af6db94a80de9b83ad1f with SHA-1 3f9a3b40 is in history
Change-Id: Ia16765ee1000f15f421c3a9c9de4d27982c1981a