Merge "Remove  configs in frameworks/base" am: 8abf78dc58 am: 3a25b32a69 am: e956291c58
am: d5c4c61639  -s ours

Change-Id: Ie89f3555c803cf92cb21e510ba79ef339b2442b4