This is a cherry-pick of ag/1640561.
1. Context.getActivityToken is not available in n mr2, passed the token
from the activity to the controller instead.
2. Haven't pick the tests from master to mr2 branch because robotest
is not set up in mr2 branch.
Fix: 32959373
Change-Id: I2f73d01ab11e91b337beb90c05bbcb857dfd40dc