Merge "Merge "Remove non-safe mode boot vibration." into oc-dr1-dev am: 149ff697ff am: 63b79f2340" into oc-mr1-dev-plus-aosp