Merge "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms" into nyc-mr2-dev am: 65924030d6
am: 962db24548  -s ours

Change-Id: I5542b89150066d5b10bac38fd05a42237b60bbd5