Merge "Poll for package stopped." into stage-aosp-tm-ts-dev