Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev am: 453951d077
am: 0cd6ca14eb

* commit '0cd6ca14eb8fbfbca9602067c93a4c6bd619ddbe':

Change-Id: I7004432a892427f5445b9a8716843e4fd8ba5e49