Merge \"Merge \\\"Make CotentResolver#openInputStream handle errors from reliable pipes.\\\" into nyc-dev am: ac3fe8fffe am: 499ab43ce3\" into nyc-mr1-dev-plus-aosp
am: 77d5fa744a

Change-Id: I3176153be2aa19e0831cbfe22a1c32f45f394d0b