[automerger skipped] Merge "Add default and nullable annotations to...
[automerger skipped] Merge "Add default and nullable annotations to NetworkStack AIDLs." into rvc-dev am: 023ee726 am: 2bf64d35 -s ours
am skip reason: Change-Id Ie2ecd84919a59adf89d0c56e4fdf2b2258fa1448 with SHA-1 48b19cb2 is in history
Change-Id: I5716c93a7a2d38ca816ebb855665e8531de0c59d