Merge commit 'bf05e35b7c154b311d542835f83a8e4ca2bf01f2' into aosp/master

Bug: 124530765
Test: atest CtsGraphicsTestCases:android.graphics.cts.BitmapTest#testDrawingHardwareBitmapNotLeaking -- --abi x86
Change-Id: I8d30f0a16ae4ad512c3463f9ad6d1381c9d1acde