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

Change-Id: Idb7dcbe5fb26cc106d8a92f7c4d8ff9b951021fb