Merge "Revert "Merge "Revert "Use aidl::nullable for nullable type in C++"" into rvc-dev-plus-aosp am: 9beacac0 am: bd9b7af3 am: ec09e10c""