Merge "Fix a NPE with outlineProvider="none""
am: 46a4fbb2e4

Change-Id: Ib14f6b5369d60c06a716b99dd0274872fc0d2a51