Merge "Revert "Add test for security bug 32873375"" into mnc-dev am: a1b717d513 am: 3e748479ab am: 2193b1e156
am: 1d31a21094

Change-Id: I8b4b56b2bf3cde991358d3411df8610a4ead9d7f