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

Change-Id: Id5df20e7353e7d199e92f7ea2eb4d3db8db1d383