Merge "Tweak SystemUpdatePolicy APIs" into pi-dev am: 892ebd0285
am: 2171b32fff

Change-Id: Icbbeef7c835a1d685615bdf2bf19eb76adcbb68f