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

Change-Id: I195fde5035cb7647c1b8b4bc4cde94726437afe9