Merge "Make SignalStrength#INVALID public"
am: f5852d1500

Change-Id: Ie7a21f66dfcecbfc78cdda3645876e21a6269d69