Merge "Add restored tasks with persisted activity to hierarchy" into sc-dev am: e9a7e0ac am: f9549963

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

Change-Id: Ib9ca9cf17ff345713076557a0018a16e607f99de