Merge "Add explicit Result::ok() checks where needed" am: bc053268cf am: 0b0c5424a8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66dafc280da0421afccadcd6c1c24e74dc306bf2