Merge "Minor fixes on android::base::expected" am: 719790f560
am: f2401ae1be

Change-Id: I1fa579281f4d14a236de91d72a416e0848abc4d5