Merge "Attempt to run error_prone_android_framework_test as unit tests" into sc-dev