Merge "SecurityManager: Don't access packet after move()" am: 51f5fdee7f
am: 1f07e6a015

Change-Id: Ib4c6e26f695484f04d4aebb04a9dcc7cd95a722a