[automerger skipped] Merge "Finish HomepageActivity when it's not the root of...

[automerger skipped] Merge "Finish HomepageActivity when it's not the root of a task and not singleTask." into main am: 4f4bb89a am: 36dc648c am: 2a29d677 -s ours

am skip reason: Merged-In Iddcba1652060d755693dd20d0e350e3d6c1ae138 with SHA-1 5a305645 is already in history

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



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