Merge "Fixed issue where HardwareBufferRenderer was not preserving contents" into udc-dev am: a374e17c am: 673d1486

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



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