CTS test case for Bug 33751424 CTS test case is testPocCVE_2017_7369 Fixing conflicts Bug: 33751424
am: de36163356

Change-Id: Ibc28030360c98d789b0e17c8a6720bdd0ac107ff