Merge changes Ifbd15bf9,I985e6861,I54860c7c into nyc-dev am: 7ad3c888 am: 72daeaed
am: 2b447ab4
* commit '2b447ab4':
Make FirewallController::createChain use replaceUidChain.
Make firewallReplaceUidChain match the behaviour of createChain.
Don't crash the test if expecting more commands than were run.
Change-Id: I50704b9536b52f7ca921aec1396eea6a281f9fc5