Merge "Match pid to check if package has been stopped" into stage-aosp-tm-ts-dev