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