Merge "Merge "Revert "Persist settings on a dedicated background thread"" into nyc-dev am: 875e99443f am: 8de4d5ecca" into nyc-mr1-dev-plus-aosp