[automerger skipped] Merge "listen to correct intent extra for defaultSubIdChange" am: 686ef19fd7 am: 0bd6a76978 -s ours
am: 133c4337ee -s ours
am skip reason: change_id Ibb79e55c0756b30669cbd5c69c181f9f9c4d186b with SHA1 addc27001e is in history

Change-Id: I1cd988f2d9eb461bdc43b4a2be435de59b10923d