Merge "Add app_api_service to lock_settings_service"