[automerger skipped] Merge "Remove clearDefaultsForInactiveSubIds." am: 1e263e7bc0 am: 4e32ac7754
am: 65d4295c3c -s ours
am skip reason: change_id Ib7bc0ae6dba6f10e3a052df1644cc77dd30121a9 with SHA1 c4c05b6d92 is in history

Change-Id: Idc2aa9fe31c0a9d03505bcd9f62af4344066d35d