resolve merge conflicts of 44e07e07 to mnc-dev am: 825b7134 am: 8c635e73 am: 343600c3 am: b965ced0  -s ours am: 129c01af
am: 88499d69

* commit '88499d69':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: Id31786b8f2f905e41e31dd7f1f8315f8dc519980