Merge "Add frameworks/base changes for enabling reduction proxy"