Merge "Keep protected content in EGLImage attrs as needed."
am: 5a03327fa8

Change-Id: Id79a4a1548e5c7f4cb504d474f856727bf0b51ee