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