Merge "dmuserd: Fix error checking" am: 7cf47025ee

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1506837

Change-Id: Ib88c59b3e93fb2d5c832ec074bed8223ec1c297e