Merge 5fba81168e8446448da68a5e546c2aa77b8dd148 on remote branch

Change-Id: I7e27ded36ef1e496ae2cf90984b3d05e1fa86200
tree: a56aee82171ee28b0ee936306f0b581a08d8ef25
  1. aidl/
  2. effect/
  3. excluded-input-devices.xml
  4. vibrator-vendor-product.mk