Merge "Remove  configs in frameworks/base" am: 8abf78dc58
am: 3a25b32a69

Change-Id: I973a5fdf94f98eb9e4c3b89340fd6a12afba1be3