[automerger skipped] Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: 17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c am: 234929445c am: a3a89a2c0a am: b6815a19d1 am: 221ebf384e -s ours

am skip reason: Change-Id I380c158e465a995a5b0f88021cbf10bbf050db00 with SHA-1 ff80ee8239 is in history

Change-Id: I445747f0823f2750b5021471286196ad2e5f6728