Merge "If requested then cache unprotected buffers even in protected mode"...

Merge "If requested then cache unprotected buffers even in protected mode" into sc-dev am: b3d39f5e am: b2dc2e4f am: 49e5e0a5

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

Change-Id: I95828e1abceb15c2b586b94446d73476cd1f454d