[automerger skipped] Merge "Revert "Wifi usability: Change the unit of the threshold for tx/rx throughput from Mbps to Kbps"" into qt-qpr1-dev am: 9c1464d7
am: bd2c67b3 -s ours
am skip reason: change_id I078d28ed81a84e32aaece839a51590364a974481 with SHA1 44e80de8 is in history

Change-Id: I33107ede5da364324a3e009ba5002fdb51a8fb5e