Merge "Finish HomepageActivity when it's not the root of a task and not...

Merge "Finish HomepageActivity when it's not the root of a task and not singleTask." into main am: 4f4bb89a am: 36dc648c

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2884507



Change-Id: If9497561d0efa2311a18886105a1ce02709373be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>