Fix incorrect setupActivity value in service metadata am: a13babc9fa am: 1cc00e9485
am: 3820646918

Change-Id: Ife30576fc2dae195d0675ea968fb8eaae99cba20