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

Change-Id: Id6f726608e69b98bf24b71d96c5ce27b2984cec6