Merge "Replace StatusOr<T> with Result<T>" into qt-dev-plus-aosp
am: e2fcbf4d56

Change-Id: I6b6c1dee4fe38ad3311554878ffa90fd970192cd