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

Change-Id: I3016d18369640dfc7336106b2272f737113b133a