[automerger skipped] DO NOT MERGE Fix the set of activities when configuring a preferred activity. am: 7bec653f -s ours
am skip reason: subject contains skip directive

Change-Id: I9452787e1fe9f5eefc332233bbe56bf902afb38c