[automerger skipped] listen to subId change and update dateEnabledSettings am: fc1020f7
am: b7e5f7bf -s ours
am skip reason: change_id I569087eb8db441544927da12df2a4dc4d37d8157 with SHA1 af8f2778 is in history
Change-Id: I231681f8b9e3cc24490902977efe68f5ba2b6b67