[automerger skipped] XfrmController.h - fix a virtual method call from...
[automerger skipped] XfrmController.h - fix a virtual method call from destructor warning am: f4d444e4 -s ours
am skip reason: Change-Id I992c9899d9f9fc6a45fac28cad46db6331436099 with SHA-1 8dc60def is in history
Change-Id: Id54331dbef2b9edc80aebb3eba0e83d66eaaa3fa