[automerger skipped] Add aidl::nullable type for nullable in AIDL am:...
[automerger skipped] Add aidl::nullable type for nullable in AIDL am: ed9884cd am: 22a55f9a -s ours am: 8a25f16e -s ours am: 436a9b42 -s ours
am skip reason: Change-Id I258f3bf66b168c4ffe3e528ac1dc5be2076a3b66 with SHA-1 175753ba is in history
Change-Id: Ia82ee25054e1eba3a7bc34b5fac60c0c389fea84