Merge "SEPolicy for Suspend Control interface." am: 87988fa6a6
am: bff499ee82

Change-Id: Ie7ea3d36a7e25f2f19370976ff0419269bfe69ff