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

Change-Id: Ic6f8eabb2a0fceefdc23295e5fd3729cd15c745b