Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584
am: 539815566f
am: bafe942da7
am: fad5089a5f
Change-Id: I45b9da57cb2d4999f5c39056d64c0f1c66a2f0fa
This commit is contained in: