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

Change-Id: Ia4f9475bac63504d9332bf576d9e12517e89d23a