[automerger skipped] Merge "Use std::optional for @nullable (AIDL)" into...
[automerger skipped] Merge "Use std::optional for @nullable (AIDL)" into rvc-dev-plus-aosp am: 7145ef89 am: 1dd8d37b am: 149ee71a -s ours
am skip reason: Change-Id I2c801e3b69f2f8ccf44267f15cbf79e1d8fbf19e with SHA-1 149be4a2 is in history
Change-Id: I23915c3a8601af1d405ea65cec5c517cc95f7893