[automerger skipped] Allows the caller to specify configuration by TetheringRequest am: 0688917e74 am: d4f206ce74 am: ef72953b83 -s ours
am skip reason: Change-Id Ic7c3a33195bbd7e72f9b8e73fa148be476b87bf3 with SHA-1 e8b9d75557 is in history

Change-Id: I036e4263a187c92c88c7fc3d33484efd6b687fcb