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

Change-Id: I03f35a2bcb66f2b0b6adb4320b7a555ef64a111b