[automerger skipped] Delete obsolete activity alias for dev settings am: 0e1393ae8c am: afbdbeb7d5
am: 192cc156b0  -s ours

Change-Id: Ib02c4b16500eaf479106c2e70b02fdaa401141e7