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

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

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

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



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