The reverted CL makes CtsnetTestCases fails on
CtsNetTestCases:android.net.cts.IpSecManagerTest#testAesGcm128Tcp6
Bug: 186608065
Test: CtsNetTestCases
Change-Id: I65eb4e45623af5d6ff8ec634ac11aa039f5cceef
Signed-off-by: Howard Chen <howardsoc@google.com>