Allow additional interface flags. Do not merge

Cherry-pick from master to fix b/6537483

Bug: 5686458
Change-Id: I9c5147446636d32bb3a420a05199870cca5f013d
1 file changed