Merge "Move class2greylist from frameworks/base." am: 2e91db9438
am: 5a49d228cc

Change-Id: I5439105d60672396bbf53a98b33eac1f75a7a0d4