Merge "Remove  config in frameworks/base"
am: 529f8d7209

Change-Id: I20e8eef28b656fd60da84da00b9d9d566d3b340b