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

Change-Id: Iea2bf71a7476de876c7afb977953bba19c366319