[automerger skipped] Merge "Merge "[Magnifier-84] Improve PixelCopy failures handling" into qt-dev am: 612f71b1 am: d88a953a" into qt-r1-dev-plus-aosp
am: 347b4928 -s ours
am skip reason: change_id I66715c56770380afafa5af5a3ee976bcaaa5ba1e with SHA1 3aa46b2d is in history

Change-Id: I466afac32741a8e9b10d6816dad3241f9353703c