[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms am: 2fc44947dd
am: 416a36a83b  -s ours

Change-Id: Ic800b08f1aca058084538b0e862c2255ab96fdb0