Merge "Switch aidl::nullable to std::optional" into rvc-dev-plus-aosp am: ce3fd2b509

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325559

Change-Id: Ifecb4e7c5ae7a0df26346b50dec6f38ecc9282c2