Merge "Change argument of active services callback to bool." into stage-aosp-master