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