Merge "Fix a strict mode violation in SystemUpdatePrefController" into pi-dev
am: 9e629edb09

Change-Id: Ibab3710f94c418dd345b76fb4d2fd3f486b8c499