[automerger skipped] Support setting the default interface to null again. am: 876e5e16a9 -s ours am: 6fb426f10a -s ours am: f7bc865d2c -s ours am: b7e2baaee0 -s ours
am skip reason: Change-Id I5109d8da3aeb6c1f6523291d9e2ec92c64b5ad2d with SHA-1 e81f99d532 is in history
Change-Id: I47dbc0ccdf9357ef85f2d9e389e0fe47a774b1bd
This commit is contained in: