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