Merge "Keep protected content in EGLImage attrs as needed." am: 5a03327fa8 am: e86b7fb0cf am: 54dd92287d
am: 7f612d4830

Change-Id: I3e26e9d5cb164154c3408a165c90ec534542c2c0