Merge "Enable Reporting Restriction in SignalStrengthTest" am: acc909a168
am: 157a531400

Change-Id: I32d17c73800da7881248ab46e62cd2eec386ec8f