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

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

Change-Id: Icd00923a9d306f634adf0369685331221c40c3ee