Merge "Merge "Fix a NPE with outlineProvider="none"" am: 46a4fbb2e4 am: 65d65ec14b am: a3460f2bb1" into oc-dev-plus-aosp
am: 939ba35913

Change-Id: Ib427f57b4a505b1622758773f24c44e1bd69db6d