Merge "Light refactoring of AndroidUnresolvedReferenceQuickFixProvider and its test to enable follow up changes." into studio-1.4-dev