DO NOT MERGE test if b/65484460 is fixed.

use PoC provided with bug to verify whether fix is present.
re-integrate the same patch, which had been reverted before.
Updated to use a much smaller POC from a related bug.

Bug: 65484460
Test: ran CTS before/after patch
 (picked from I74452b76fb7a938c4e3c9b67eb4033fa52730332)

Change-Id: I77a2d72ea5b00cd9f2a5e0dbcbefc59df9761c27
(cherry picked from commit 3ea670d5490549dff3ad869639f582add2a852fa)
2 files changed