device: usb: add changes for diag to work with rndis composition

we use persist.sys.usb.config.extra to specify if we want to use diag with
rndis interface earlier userspace used to read this property to check
whether diag is to be included in composition and used to set appropriate
composition.

Now we plan to make this check and change in device specific files. This
change checks whenever there is a composition with rndis and
persist.sys.usb.config.extra indicates to include diag we set the
usb.sys.config to reflect this indication. User now need to set extra
property to diag and based on the baseband information we can figure out
clients representing diag interface.

Change-Id: I3257f47ed42b3ad4fea68a6deb45c27944614558
Bluetooth: Disable Interleave scan feature from Host

Disable Interleave Bluetooth scan feature from host side
as it is enabled from SOC.

It's revert of I3c4672d3758ef2ae7a093cd6f121db28ea1672ce.

Change-Id: I22748b6707a62f9dddf23ff81250770875c9ef0b
Merge "Merge "Camera: Flash mode settings array values reordered""
Merge "Merge "Merge "Camera: Flash mode settings array values reordered"""
Merge "Merge "Camera: Flash mode settings array values reordered""
Merge "Merge "Merge "Camera: Flash mode settings array values reordered"""
Merge "Merge "init script: Add usergroup write permission to idle_time node.""
Merge "Merge "Merge "init script: Add usergroup write permission to idle_time node."""
Merge "Merge "init script: Add usergroup write permission to idle_time node.""
Merge "Merge "Merge "init script: Add usergroup write permission to idle_time node."""
Merge "Merge "init script: Add usergroup write permission to idle_time node.""
Merge "Merge "Merge "init script: Add usergroup write permission to idle_time node."""
Merge "Merge "init script: Add usergroup write permission to idle_time node.""
Merge "Merge "Merge "init script: Add usergroup write permission to idle_time node."""
Merge "Merge "init script: Add usergroup write permission to idle_time node.""
Merge "Merge "Merge "init script: Add usergroup write permission to idle_time node."""
Merge "Merge "power: Modify power HAL hint for Interactive governor""
Merge "Merge "Merge "power: Modify power HAL hint for Interactive governor"""
Merge "Merge "power: Modify power HAL hint for Interactive governor""
Merge "Merge "Merge "power: Modify power HAL hint for Interactive governor"""