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