Merge "Update SystemUpdatePolicy wording" into oc-dev
am: 7cf5f74f3f

Change-Id: Ifac890402f5f352d00ccb5eb3809b67a125d2b24