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