[automerger skipped] Merge "Use aidl::nullable for nullable type in C++" into...
[automerger skipped] Merge "Use aidl::nullable for nullable type in C++" into rvc-dev am: 9432967d -s ours am: 9402288d -s ours
am skip reason: Change-Id Ie3196ee5cce17d77950eea9479d2cc1406e9e674 with SHA-1 c85cc13b is in history
Change-Id: Ia03bf64ed9535941bb9b8a9eceba5053ea661361