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

Change-Id: Ic789c31c8f6aa8139be70f6f861f060fa2c2331b