[automerger skipped] Add aidl::nullable type for nullable in AIDL am:...
[automerger skipped] Add aidl::nullable type for nullable in AIDL am: a276b054 am: 5e1a6429 am: 2c5e2697 -s ours
am skip reason: Change-Id I378dbf848a51a705a9e06f9cd4b0def9728c3bff with SHA-1 debae060 is in history
Change-Id: Id2b8bd6c5d6b0a2b1061bb664de2ec2171d70431