Merge changes Ifbd15bf9,I985e6861,I54860c7c into nyc-dev
am: 7ad3c888
* commit '7ad3c888':
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: Ib9dac62413187fc9b4978dfe14b7d29dbf328328