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

Change-Id: Ida92ee646fe101c1c886fecc9351257435571d39