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

Change-Id: I1c9a7544d7ccca85188bf09cfa6556832b1eb438