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

Change-Id: I76ff0ef560ff2950a31c887f0b704bf7d02e3671