[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 -s ours am: 659a71fe -s ours
am skip reason: Change-Id Ie2ecd84919a59adf89d0c56e4fdf2b2258fa1448 with SHA-1 2286603c is in history
Change-Id: I83138fae925efa863c53ee8cda1cce148a674688