[automerger skipped] Support setting the default interface to null again. am: 876e5e16a9 am: 65c1bc7c5d -s ours am: 4c80e73bfa -s ours
am skip reason: Change-Id I5109d8da3aeb6c1f6523291d9e2ec92c64b5ad2d with SHA-1 876e5e16a9 is in history
Change-Id: I53d8a9896257920d4a3db462a7f3a1c8974361fa
This commit is contained in: