Merge "Merge "Fix a NPE with outlineProvider="none"" am: 46a4fbb2 am: 65d65ec1 am: a3460f2b" into oc-dev-plus-aosp