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

Change-Id: Ia028c1f9732f882ba85ae4fea8f9abf52ca75a8c