Merge "Update api-lint baseline for NO_SETTINGS_PROVIDER" am: 2ba0a25175

Change-Id: I97538f6219aff5472cd7855c6562f86deedd9487