Merge "Increase People Tile restore timeout to 48h" into sc-dev am: 457feb05 am: 1f3c76c0 am: e5839319

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15173052

Change-Id: I35c215da20e36344a2a348648a8df60b2c5d1609