Merge "Clarify SystemUpdatePolicy" into pi-dev
am: 4019c39405

Change-Id: I7d9129aaa404940391139acf2f40eca97fda9165