Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I5e28537689d1a53e99f91eafd494eb3a0c890f46
Change-Id: I436ef37a509cbe56d02c6d8d3a38c776f4b4883f
tree: d0f35d898b1da3141e88175ca1db9880ae27df8a
  1. Tethering/