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