Merge "Add config_supportBluetoothPersistedState." am: 524fe66549
am: 171b8f366a

Change-Id: If1f43a76c6ade2dd2ba82f0057aa528d4624981c