Merge "Fix screenshot buffer leaks" into udc-qpr-dev am: 3a4bf0e5 am: fe9ad735

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



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