Merge "Add active services count callback to lazy services." into stage-aosp-master