Merge changes from topic "am-6be8d866332e40f286e46642342a5555" into qt-r1-dev-plus-aosp

* changes:
  Merge "Revert "Change attrbute of double-power-to-camera vibration"" into qt-dev am: 697989a615 am: 03e64d649e
  Merge "Revert "Change attribute of fingerprint vibrations"" into qt-dev am: c0ef6a71ef am: cea66dd3d0