[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 am: 6f8d13de am: 1d833e53 am: 7d1e922d -s ours am: 02f3b5ab -s ours

am skip reason: Change-Id Ie3196ee5cce17d77950eea9479d2cc1406e9e674 with SHA-1 c85cc13b is in history

Change-Id: Idebcdd17d2736d698a04e8db5b3d6a0aa8f9bb59