Merge "Always report non-null TetherStatesParcel" am: dd1b26bf25 am: 5aeb1cdb03 am: badf5be580

Change-Id: I4eba246b0e9093665a391624e1df95b621637e11