Merge "If requested then cache unprotected buffers even in protected mode" into sc-dev am: b3d39f5e am: 494ddea9

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

Change-Id: I78b1b24fdae24c1fe6931d53ccf0aeb18a538fd3