Merge "Add allow kitchensink_app activity_task_service:service_manager find to KitchenSink" into qt-dev am: a5db23f0db am: 9ecdd7b84c
am: ee80aec50b

Change-Id: I7218d4f47d409fafa5ea86c25fcb19f54ef6a92f