[automerger skipped] Fix TextureView.getBitmap with scale layer transform am: 421449a4a6  -s ours
am: 3c3beb6e3c  -s ours

Change-Id: If5013fb598e3b08be37ffadb13adbf918786c3d0