Merge "Use custom action instead of direct broadcast" into stage-aosp-tm-ts-dev