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

Change-Id: I7d36160a1b58d579cb4164bd1ae7e23381643c01