Android Mainline 12.0.0 Release 61 (7993648,com.google.android.ipsec)
Snap for 7478067 from b3149b133c5c227f29258e67756be949afa319c8 to mainline-ipsec-release

Change-Id: Iea83e6497d2f53e008ed3c8f8c78ee330f8f369e