Merge "Add android::base::expected" am: 691e0e154a
am: cfd923af77

Change-Id: I182dd0a98a0c0978367eb058d399715508a705d3