Merge "Revert "Add test for security bug 32873375"" into mnc-dev am: a1b717d513 am: 3e748479ab am: 2193b1e156 am: 1d31a21094 am: 94c60a68e9 am: fb4130bddc am: 3662f84e68 am: cee2c244d9
am: ecaa79eec2

Change-Id: I49f1b6b98d9242b9d8efdb8c4bf07d027b93687c