Merge "Merge "Increase People Tile restore timeout to 48h" into sc-dev am: 457feb05 am: e17056d8" into sc-v2-dev-plus-aosp