Merge "Remove class2greylist from frameworks/base." am: 32979f03fe am: 1397d297f0
am: 8636f97bf0

Change-Id: I4bedbf4a52a5caba565b050f5bad06b42a49063d