[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: 7ec1a5c170 -s ours am: 1d987e05ae -s ours am: e5fef65c0e -s ours

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

Change-Id: I1e14af5e9cc436d283742e5cccd122115fe14804