[automerger skipped] Merge "Add docs for setSignalStrengthReportingCriteria" into pi-dev
am: 518b8253b0  -s ours

Change-Id: Id8204bc4c43b4b9efdffa2ccd7742fce20973615