Merge "Revert "Do not notify SS change with invalid subId"" into qt-r1-dev
am: 464a509b4a

Change-Id: Idc23f8684d94c5aee4174ae872d5fdfe0bb7b766