DO NOT MERGE Return the preferred home activity first to honor persistent...

DO NOT MERGE Return the preferred home activity first to honor persistent preferred activity. am: bb478f97

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



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