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

Change-Id: Ia325762e4e111403fbbfff3b8c2cc5655b82d76f