Merge 59daa796aa599c6f9c709fbfbc714137cfb3768c on remote branch

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