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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7aa83bba5e3f06d94dec1b3eb767fc0d4cdd812