Merge "Respect empty vibration effect configs in PhoneWindowManager and VibratorService" into oc-dev
am: 4c6a49ed47

Change-Id: Ib92f2dbad240bae9f46a23aa61eb2b7d09a96896