Merge "Revert "Change attrbute of double-power-to-camera vibration"" into qt-dev
am: 697989a615

Change-Id: I11262f523c743fc2961b849d842d196f21fda2e6