[automerger skipped] Add aidl::nullable type for nullable in AIDL am:...
[automerger skipped] Add aidl::nullable type for nullable in AIDL am: ed9884cd -s ours am: 812480ba -s ours
am skip reason: Change-Id I258f3bf66b168c4ffe3e528ac1dc5be2076a3b66 with SHA-1 175753ba is in history
Change-Id: I15d12cfec0bd87446aa6057a2bb29c121822c41b