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