Merge "Merge "Remember the process that token was added for also for the...
Merge "Merge "Remember the process that token was added for also for the services that are already running" into qt-dev am: b112f3f6 am: 9ea55c0c" into qt-r1-dev-plus-aosp
am: 9adbcec9
Change-Id: I4eb7567fe84b16fc98f6863a1e962c171e2e836b