Merge "Return to previous RenderEngine behavior for protected buffers" into sc-dev am: 46259c5ca6 am: 3f30cdef5a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14683753

Change-Id: Ic4c12af195d397c3304bac95081897b7b2230ddc