Merge "Make SignalStrength#INVALID public" am: f5852d1500
am: f79f209b08

Change-Id: I765099d1bdf906eb7709b3d83a594ea1febcf599