Merge "Remove  config in frameworks/base" am: 529f8d7209 am: 32e1d7f6b4
am: 1c4c9c7690

Change-Id: I0c1436660146bcebc573671b4fbc0f95df25b4ab