Merge "Framework: Clean up blacklist" into stage-aosp-master am: c53172e3f8 am: eeeac923bd
am: d1ec5eb541

Change-Id: I46d639ae44e2818ca218f1169d3ba1ad4cb07612