Merge "ASSERT/EXPECT_RESULT_OK follows gtest style." am: 3ee655d470 am: 0fea5bef47 am: 8bb3f21601 am: ada0d6e68a

Original change: https://android-review.googlesource.com/c/platform/system/libbase/+/1928466

Change-Id: I47b97933b0ea390773b4f1a631bf7aceeb458a7d