Merge "Fix RssiMonitoring VTS tests" into oc-dev
am: 5c604fc1d4

Change-Id: I2dd80498e6c3aa3ad05656229acfd04b7f937337