Merge "Merge "Remember the process that token was added for also for the services that are already running" into qt-dev am: b112f3f62b am: 9ea55c0c2e" into qt-r1-dev-plus-aosp
am: 9adbcec9a7

Change-Id: I4eb7567fe84b16fc98f6863a1e962c171e2e836b