Merge "Always report non-null TetherStatesParcel" am: dd1b26bf25

Change-Id: If5193dba1150fdf0c04e9585367206b11c8d04a4