[automerger skipped] Merge "Correct the logic of identifying Home" into...

[automerger skipped] Merge "Correct the logic of identifying Home" into udc-dev am: 3a9b6fc0 -s ours

am skip reason: Merged-In I37a170569a7c36e4047a6a347243e6282498e5ac with SHA-1 81421344 is already in history

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



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