Merge \\"Run the SELinux wallpaper restorecon operations on all users\\" into nyc-mr1-dev am: bf9fa8280e
am: 7ce8cfbec4

Change-Id: I8e5e20a2a9b21ec6a704aa9c7abb3a0ef1878d12