Android R Preview 3 (RPP3.200320.017)
Use optional for nullable types am: ec64e6f372

Change-Id: I4ff486573fa9fdba072cb560a7fdf750aae81e85