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

Change-Id: Ia7e6236705d961c14a72d8e21d1dba84dc84c501