Merge changes from topic "revert-1540633-DNRXHDZSUB"

* changes:
  Revert "matrix: IVibrator AIDL has version 2."
  Revert "Update AIDL IVibrator manifest version to 2."