[automerger skipped] Use aidl::nullable for nullable type in C++ am: c85cc13b5a -s ours am: a76ebb29e0 -s ours am: a423099a22 -s ours
am skip reason: Change-Id I33822bc76ef87637d5408849f64a0607e121792e with SHA-1 4b1d2889dc is in history
Change-Id: I933e7b6b2c2cf4598b5f835edb1d0340681e1c0f
This commit is contained in: