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

Merge "DO NOT MERGE Return the preferred home activity first to honor persistent preferred activity." into tm-qpr-dev am: de146265

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



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