[automerger skipped] Merge "Deprecated UserManager.getUsers(excludeDying) /...

[automerger skipped] Merge "Deprecated UserManager.getUsers(excludeDying) / added getAliveUsers()" am: c0b44fca am: bd2f82c8 am: 70edf54d -s ours

am skip reason: Change-Id Ife767a40b7b7790ba28b5377046de822ddbf275c with SHA-1 6dc6d2b9 is in history

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

Change-Id: I93a7443dabeb35e8ab6e32004730f99e2fc49d69