Merge "Add config_supportBluetoothPersistedState."
am: 524fe66549

Change-Id: I17c56fa8a5b5a984e26591d1e0e830a1c54fa28e