Merge "Tweak SystemUpdatePolicy APIs" into pi-dev