Merge upstream

nicki: support xperia m dual

  - check baseband version and enable dual sim if ds baseband detected.
  - don't set anything on older unsupported basebands (you are not supposed to use cm on 4.1/4.2 basebands)

Change-Id: I7579d484cdef8540aa272abfeb129f3ef43f0531

Conflicts:
	BoardConfig.mk
	tg.mk

Change-Id: I5bb7145579dcea598852dfef959096ca9d690964

nicki: Enable proximity wake option

working fine so enable

Change-Id: Ia66a09fba5f27695e6f61d040cbe75f07611271b

Conflicts:
	overlay/frameworks/base/core/res/res/values/config.xml

Change-Id: I0f593432f66e52896d080454637c2f73ed4c48b1

nicki: init: remove uneeded

Change-Id: Ib6f21412824bfc5475fcaa3742789267b089db12

nicki: revert recent volume changes

 - Updated audcal and this isn't fixing our glitches problem totally but
   creating unfixable low volume in loudspeaker and microphone in-call so
   better revert volume changes and audcal for now.

Change-Id: Ie8690c47c55cdd41d4737a7a385f7851ef607be1

nicki: clean-up class_main script

 - use this script only for starting 2nd ril daemon

Change-Id: I46e0f0f5afdd10cd06fea3ee83fd07284e3b3c98

nicki: move prima configuration file from vendor

 - use patched nv fw from /persist, without this wifi fall back
   to auto generated MAC.

Change-Id: I230e2ecd81a74a09ac6d48d0b9b2e1d5a2715136

nicki: remove gyroscope permissions

Change-Id: I3926fdb6a6e9cc2a1d2b7aa9ad9e93eb2a9048da
Signed-off-by: percy-g2 <gahlotpercy@gmail.com>