Merge "Remove ACgroupController_getFlags to fix API breakage" am: ad6f656be2
am: 27b827b01b

Change-Id: I74f89f910b389c9d81c989120623fa250e0ff2ee