[automerger skipped] Add aidl::nullable type for nullable in AIDL am:...
[automerger skipped] Add aidl::nullable type for nullable in AIDL am: 175753ba -s ours am: 49e4ebc7 -s ours am: a91d1377 -s ours
am skip reason: Change-Id I378dbf848a51a705a9e06f9cd4b0def9728c3bff with SHA-1 a276b054 is in history
Change-Id: I055e1e412ac9944d8c65b51eacf6e7448eb9f454