Merge "Derestrict mSurfaceTexture, mProducer." am: 8e6ce38bde am: c1dbf374d0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3321c80292eada053fa4ef3319d9d3555fee3e6