DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest.
am: 144223318c -s ours
Change-Id: Ie27a544873f3336ef3078798482857a538cc1c89
This commit is contained in:
am: 144223318c -s ours
Change-Id: Ie27a544873f3336ef3078798482857a538cc1c89