Merge \\\"Make CotentResolver#openInputStream handle errors from reliable pipes.\\\" into nyc-dev am: ac3fe8fffe am: be6e44cdfa
am: 55ab54e33d

Change-Id: Ib073f974518fd01850c9a4be14fe6987658cf1d3