Merge "Remove  config in frameworks/base" am: 529f8d7209 am: 32e1d7f6b4 am: 1c4c9c7690
am: 7a99ecfa17  -s ours

Change-Id: I963ac23ece588b2dfcc7d6096098339b8695a660