Merge "Reduce unnecessary operations in perpareSurface" into udc-dev am: 6f773fa6 am: 8386b906

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



Change-Id: Ic5df155426b204b9a07a8bd7bf2368e23ed22f40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>