Merge "Deprecate Duplicate SignalStrength Methods" am: a3ab270ce1 am: e880dcb9ea
am: 20cbf841d9

Change-Id: I80cf1ea3bc62aa3e7a5428a3b6b501519148f746