Merge "Update AttentionManagerService"