merge Tether{Down,Up}stream4{Key,Value} - part 3 - fixups

Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia7840698e80ded33d8e0b59efe1ca7267254b892
4 files changed
tree: 7ebb36db41ce7fd358c74ae8bbac4e22e7ac0760
  1. framework/
  2. tests/
  3. Tethering/
  4. .gitignore
  5. OWNERS
  6. PREUPLOAD.cfg
  7. TEST_MAPPING