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

Change-Id: I50b72dab019a91d6d5a79d2b28079ef9e40b965d