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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibcaf3ee7efc4d1f73411fb5d4ce329bfbb9f5a63