Merge "Enable Reporting Restriction in SignalStrengthTest"
am: acc909a168

Change-Id: I45339ba5ec053b2b8d5db7ffcfa2f8a2b4939959