Merge "Clean up ownership in frameworks/base/" into sc-dev