Merge "Add explicit Result::ok() checks where needed" am: c08d3ef8a8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8477ea3254ef4052e81c6bf3b80fae393f1e4080